RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-01-05 19:29:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

The coalescer doesn't need LiveVariables now that we have register use iterators.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@51790 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2008-05-30 22:37:27 +00:00
parent ba2c487424
commit dbb8137c11
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/CodeGen/SimpleRegisterCoalescing.cpp
View File

@ -17,7 +17,6 @@
#include "VirtRegMap.h" #include "VirtRegMap.h"
#include "llvm/CodeGen/LiveIntervalAnalysis.h" #include "llvm/CodeGen/LiveIntervalAnalysis.h"
#include "llvm/Value.h" #include "llvm/Value.h"
#include "llvm/CodeGen/LiveVariables.h"
#include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineFrameInfo.h"
#include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineInstr.h"
#include "llvm/CodeGen/MachineLoopInfo.h" #include "llvm/CodeGen/MachineLoopInfo.h"
@ -66,7 +65,6 @@ void SimpleRegisterCoalescing::getAnalysisUsage(AnalysisUsage &AU) const {
AU.addPreservedID(MachineDominatorsID); AU.addPreservedID(MachineDominatorsID);
AU.addPreservedID(PHIEliminationID); AU.addPreservedID(PHIEliminationID);
AU.addPreservedID(TwoAddressInstructionPassID); AU.addPreservedID(TwoAddressInstructionPassID);
AU.addRequired<LiveVariables>();
AU.addRequired<LiveIntervals>(); AU.addRequired<LiveIntervals>();
AU.addRequired<MachineLoopInfo>(); AU.addRequired<MachineLoopInfo>();
MachineFunctionPass::getAnalysisUsage(AU); MachineFunctionPass::getAnalysisUsage(AU);
@ -967,10 +965,10 @@ bool SimpleRegisterCoalescing::JoinCopy(CopyRec &TheCopy, bool &Again) {
// if this will cause a high use density interval to target a smaller // if this will cause a high use density interval to target a smaller
// set of registers. // set of registers.
if (SmallRegSize > Threshold || LargeRegSize > Threshold) { if (SmallRegSize > Threshold || LargeRegSize > Threshold) {
LiveVariables::VarInfo &svi = lv_->getVarInfo(LargeReg); if ((float)std::distance(mri_->use_begin(SmallReg),
LiveVariables::VarInfo &dvi = lv_->getVarInfo(SmallReg); mri_->use_end()) / SmallRegSize <
if ((float)dvi.NumUses / SmallRegSize < (float)std::distance(mri_->use_begin(LargeReg),
(float)svi.NumUses / LargeRegSize) { mri_->use_end()) / LargeRegSize) {
Again = true; // May be possible to coalesce later. Again = true; // May be possible to coalesce later.
return false; return false;
} }
@ -1026,9 +1024,9 @@ bool SimpleRegisterCoalescing::JoinCopy(CopyRec &TheCopy, bool &Again) {
// do not join them, instead mark the physical register as its allocation // do not join them, instead mark the physical register as its allocation
// preference. // preference.
unsigned Length = JoinVInt.getSize() / InstrSlots::NUM; unsigned Length = JoinVInt.getSize() / InstrSlots::NUM;
LiveVariables::VarInfo &vi = lv_->getVarInfo(JoinVReg);
if (Length > Threshold && if (Length > Threshold &&
(((float)vi.NumUses / Length) < (1.0 / Threshold))) { (((float)std::distance(mri_->use_begin(JoinVReg),
mri_->use_end()) / Length) < (1.0 / Threshold))) {
JoinVInt.preference = JoinPReg; JoinVInt.preference = JoinPReg;
++numAborts; ++numAborts;
DOUT << "\tMay tie down a physical register, abort!\n"; DOUT << "\tMay tie down a physical register, abort!\n";
@ -1111,11 +1109,6 @@ bool SimpleRegisterCoalescing::JoinCopy(CopyRec &TheCopy, bool &Again) {
for (const unsigned *AS = tri_->getSubRegisters(DstReg); *AS; ++AS) for (const unsigned *AS = tri_->getSubRegisters(DstReg); *AS; ++AS)
li_->getOrCreateInterval(*AS).MergeInClobberRanges(*ResSrcInt, li_->getOrCreateInterval(*AS).MergeInClobberRanges(*ResSrcInt,
li_->getVNInfoAllocator()); li_->getVNInfoAllocator());
} else {
// Merge use info if the destination is a virtual register.
LiveVariables::VarInfo& dVI = lv_->getVarInfo(DstReg);
LiveVariables::VarInfo& sVI = lv_->getVarInfo(SrcReg);
dVI.NumUses += sVI.NumUses;
} }
// If this is a EXTRACT_SUBREG, make sure the result of coalescing is the // If this is a EXTRACT_SUBREG, make sure the result of coalescing is the
@ -2011,7 +2004,6 @@ bool SimpleRegisterCoalescing::runOnMachineFunction(MachineFunction &fn) {
tri_ = tm_->getRegisterInfo(); tri_ = tm_->getRegisterInfo();
tii_ = tm_->getInstrInfo(); tii_ = tm_->getInstrInfo();
li_ = &getAnalysis<LiveIntervals>(); li_ = &getAnalysis<LiveIntervals>();
lv_ = &getAnalysis<LiveVariables>();
loopInfo = &getAnalysis<MachineLoopInfo>(); loopInfo = &getAnalysis<MachineLoopInfo>();
DOUT << "********** SIMPLE REGISTER COALESCING **********\n" DOUT << "********** SIMPLE REGISTER COALESCING **********\n"

1
lib/CodeGen/SimpleRegisterCoalescing.h
View File

@ -83,7 +83,6 @@ namespace llvm {
const TargetRegisterInfo* tri_; const TargetRegisterInfo* tri_;
const TargetInstrInfo* tii_; const TargetInstrInfo* tii_;
LiveIntervals *li_; LiveIntervals *li_;
LiveVariables *lv_;
const MachineLoopInfo* loopInfo; const MachineLoopInfo* loopInfo;
BitVector allocatableRegs_; BitVector allocatableRegs_;