[llvm-commits] CVS: llvm/lib/CodeGen/PhysRegTracker.h RegAllocLinearScan.cpp
Alkis Evlogimenos
alkis at cs.uiuc.edu
Sun Feb 22 18:59:00 PST 2004
Changes in directory llvm/lib/CodeGen:
PhysRegTracker.h added (r1.1)
RegAllocLinearScan.cpp updated: 1.56 -> 1.57
---
Log message:
Pull PhysRegTracker out of RegAllocLinearScan as it can be used by other allocators as well
---
Diffs of the changes: (+92 -59)
Index: llvm/lib/CodeGen/PhysRegTracker.h
diff -c /dev/null llvm/lib/CodeGen/PhysRegTracker.h:1.1
*** /dev/null Sun Feb 22 18:53:41 2004
--- llvm/lib/CodeGen/PhysRegTracker.h Sun Feb 22 18:53:31 2004
***************
*** 0 ****
--- 1,79 ----
+ //===-- llvm/CodeGen/LiveInterval.h - Live Interval Analysis ----*- C++ -*-===//
+ //
+ // The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ //
+ //===----------------------------------------------------------------------===//
+ //
+ // This file implements a physical register tracker. The tracker
+ // tracks physical register usage through addPhysRegUse and
+ // delPhysRegUse functions while abstracting away register aliases.
+ //
+ //===----------------------------------------------------------------------===//
+
+ #ifndef LLVM_CODEGEN_PHYSREGTRACKER_H
+ #define LLVM_CODEGEN_PHYSREGTRACKER_H
+
+ #include "llvm/CodeGen/MachineFunction.h"
+ #include <vector>
+
+ namespace llvm {
+
+ class PhysRegTracker {
+ private:
+ const MRegisterInfo* mri_;
+ std::vector<unsigned> regUse_;
+
+ public:
+ PhysRegTracker(MachineFunction* mf)
+ : mri_(mf ? mf->getTarget().getRegisterInfo() : NULL) {
+ if (mri_) {
+ regUse_.assign(mri_->getNumRegs(), 0);
+ }
+ }
+
+ PhysRegTracker(const PhysRegTracker& rhs)
+ : mri_(rhs.mri_),
+ regUse_(rhs.regUse_) {
+ }
+
+ const PhysRegTracker& operator=(const PhysRegTracker& rhs) {
+ mri_ = rhs.mri_;
+ regUse_ = rhs.regUse_;
+ return *this;
+ }
+
+ void addRegUse(unsigned physReg) {
+ assert(MRegisterInfo::isPhysicalRegister(physReg) &&
+ "should be physical register!");
+ ++regUse_[physReg];
+ for (const unsigned* as = mri_->getAliasSet(physReg); *as; ++as) {
+ physReg = *as;
+ ++regUse_[physReg];
+ }
+ }
+
+ void delRegUse(unsigned physReg) {
+ assert(MRegisterInfo::isPhysicalRegister(physReg) &&
+ "should be physical register!");
+ assert(regUse_[physReg] != 0);
+ --regUse_[physReg];
+ for (const unsigned* as = mri_->getAliasSet(physReg); *as; ++as) {
+ physReg = *as;
+ assert(regUse_[physReg] != 0);
+ --regUse_[physReg];
+ }
+ }
+
+ bool isPhysRegAvail(unsigned physReg) const {
+ assert(MRegisterInfo::isPhysicalRegister(physReg) &&
+ "should be physical register!");
+ return regUse_[physReg] == 0;
+ }
+ };
+
+ } // End llvm namespace
+
+ #endif
Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.56 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.57
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.56 Sun Feb 22 18:50:15 2004
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp Sun Feb 22 18:53:31 2004
@@ -27,6 +27,7 @@
#include "Support/Statistic.h"
#include "Support/STLExtras.h"
#include "LiveIntervals.h"
+#include "PhysRegTracker.h"
#include <algorithm>
using namespace llvm;
@@ -34,53 +35,6 @@
Statistic<> numStores("ra-linearscan", "Number of stores added");
Statistic<> numLoads ("ra-linearscan", "Number of loads added");
- class PhysRegTracker {
- private:
- const MRegisterInfo* mri_;
- std::vector<unsigned> regUse_;
-
- public:
- PhysRegTracker(MachineFunction* mf)
- : mri_(mf ? mf->getTarget().getRegisterInfo() : NULL) {
- if (mri_) {
- regUse_.assign(mri_->getNumRegs(), 0);
- }
- }
-
- PhysRegTracker(const PhysRegTracker& rhs)
- : mri_(rhs.mri_),
- regUse_(rhs.regUse_) {
- }
-
- const PhysRegTracker& operator=(const PhysRegTracker& rhs) {
- mri_ = rhs.mri_;
- regUse_ = rhs.regUse_;
- return *this;
- }
-
- void addPhysRegUse(unsigned physReg) {
- ++regUse_[physReg];
- for (const unsigned* as = mri_->getAliasSet(physReg); *as; ++as) {
- physReg = *as;
- ++regUse_[physReg];
- }
- }
-
- void delPhysRegUse(unsigned physReg) {
- assert(regUse_[physReg] != 0);
- --regUse_[physReg];
- for (const unsigned* as = mri_->getAliasSet(physReg); *as; ++as) {
- physReg = *as;
- assert(regUse_[physReg] != 0);
- --regUse_[physReg];
- }
- }
-
- bool isPhysRegAvail(unsigned physReg) const {
- return regUse_[physReg] == 0;
- }
- };
-
class RA : public MachineFunctionPass {
private:
MachineFunction* mf_;
@@ -285,7 +239,7 @@
// if this register is fixed we are done
if (MRegisterInfo::isPhysicalRegister(cur->reg)) {
- prt_.addPhysRegUse(cur->reg);
+ prt_.addRegUse(cur->reg);
active_.push_back(cur);
handled_.push_back(cur);
}
@@ -308,7 +262,7 @@
if (MRegisterInfo::isVirtualRegister(reg)) {
reg = v2pMap_[reg];
}
- prt_.delPhysRegUse(reg);
+ prt_.delRegUse(reg);
}
DEBUG(printVirtRegAssignment());
@@ -401,7 +355,7 @@
if (MRegisterInfo::isVirtualRegister(reg)) {
reg = v2pMap_[reg];
}
- prt_.delPhysRegUse(reg);
+ prt_.delRegUse(reg);
// remove from active
i = active_.erase(i);
}
@@ -411,7 +365,7 @@
if (MRegisterInfo::isVirtualRegister(reg)) {
reg = v2pMap_[reg];
}
- prt_.delPhysRegUse(reg);
+ prt_.delRegUse(reg);
// add to inactive
inactive_.push_back(*i);
// remove from active
@@ -441,7 +395,7 @@
if (MRegisterInfo::isVirtualRegister(reg)) {
reg = v2pMap_[reg];
}
- prt_.addPhysRegUse(reg);
+ prt_.addRegUse(reg);
// add to active
active_.push_back(*i);
// remove from inactive
@@ -485,7 +439,7 @@
unsigned reg = (*i)->reg;
if (MRegisterInfo::isVirtualRegister(reg))
reg = v2pMap_[reg];
- prt_.addPhysRegUse(reg);
+ prt_.addRegUse(reg);
updateSpillWeights(reg, (*i)->weight);
}
}
@@ -496,7 +450,7 @@
e = fixed_.end(); i != e; ++i) {
if (cur->overlaps(**i)) {
unsigned reg = (*i)->reg;
- prt_.addPhysRegUse(reg);
+ prt_.addRegUse(reg);
updateSpillWeights(reg, (*i)->weight);
}
}
@@ -611,12 +565,12 @@
active_.erase(it);
if (MRegisterInfo::isPhysicalRegister(i->reg)) {
fixed_.push_front(i);
- prt_.delPhysRegUse(i->reg);
+ prt_.delRegUse(i->reg);
}
else {
Virt2PhysMap::iterator v2pIt = v2pMap_.find(i->reg);
clearVirtReg(v2pIt);
- prt_.delPhysRegUse(v2pIt->second);
+ prt_.delRegUse(v2pIt->second);
if (i->spilled()) {
if (!i->empty()) {
IntervalPtrs::iterator it = unhandled_.begin();
@@ -671,10 +625,10 @@
DEBUG(std::cerr << "\t\t\tundo changes for: " << **i << '\n');
active_.push_back(*i);
if (MRegisterInfo::isPhysicalRegister((*i)->reg))
- prt_.addPhysRegUse((*i)->reg);
+ prt_.addRegUse((*i)->reg);
else {
assert(v2pMap_.count((*i)->reg));
- prt_.addPhysRegUse(v2pMap_.find((*i)->reg)->second);
+ prt_.addRegUse(v2pMap_.find((*i)->reg)->second);
}
}
}
@@ -766,7 +720,7 @@
tie(it, inserted) = v2pMap_.insert(std::make_pair(virtReg, physReg));
assert(inserted && "attempting to assign a virt->phys mapping to an "
"already mapped register");
- prt_.addPhysRegUse(physReg);
+ prt_.addRegUse(physReg);
return it;
}
More information about the llvm-commits
mailing list