maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

CalcSpillWeights: give a better describing name to calculateSpillWeights 

Besides, this relates it more obviously to the VirtRegAuxInfo::calculateSpillWeightAndHint.

No functionnal change.

llvm-svn: 194404
This commit is contained in:
Arnaud A. de Grandmaison 2013-11-11 19:04:45 +00:00
parent 26386be183
commit ea3ac1612c
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/include/llvm/CodeGen/CalcSpillWeights.h
View File

@ -55,16 +55,14 @@ namespace llvm {
: MF(mf), LIS(lis), Loops(loops), MBFI(mbfi) {}
/// \brief (re)compute li's spill weight and allocation hint.
void CalculateWeightAndHint(LiveInterval &li);
void calculateSpillWeightAndHint(LiveInterval &li);
};
/// \brief Compute spill weights and allocation hints for all virtual register
/// live intervals.
void calculateSpillWeights(LiveIntervals &LIS,
MachineFunction &MF,
const MachineLoopInfo &MLI,
const MachineBlockFrequencyInfo &MBFI);
void calculateSpillWeightsAndHints(LiveIntervals &LIS, MachineFunction &MF,
const MachineLoopInfo &MLI,
const MachineBlockFrequencyInfo &MBFI);
}
#endif // LLVM_CODEGEN_CALCSPILLWEIGHTS_H

6
llvm/lib/CodeGen/CalcSpillWeights.cpp
View File

@ -22,7 +22,7 @@
#include "llvm/Target/TargetRegisterInfo.h"
using namespace llvm;
void llvm::calculateSpillWeights(LiveIntervals &LIS,
void llvm::calculateSpillWeightsAndHints(LiveIntervals &LIS,
MachineFunction &MF,
const MachineLoopInfo &MLI,
const MachineBlockFrequencyInfo &MBFI) {
@ -35,7 +35,7 @@ void llvm::calculateSpillWeights(LiveIntervals &LIS,
unsigned Reg = TargetRegisterInfo::index2VirtReg(i);
if (MRI.reg_nodbg_empty(Reg))
continue;
VRAI.CalculateWeightAndHint(LIS.getInterval(Reg));
VRAI.calculateSpillWeightAndHint(LIS.getInterval(Reg));
}
}
@ -92,7 +92,7 @@ static bool isRematerializable(const LiveInterval &LI,
}
void
VirtRegAuxInfo::CalculateWeightAndHint(LiveInterval &li) {
VirtRegAuxInfo::calculateSpillWeightAndHint(LiveInterval &li) {
MachineRegisterInfo &mri = MF.getRegInfo();
const TargetRegisterInfo &tri = *MF.getTarget().getRegisterInfo();
MachineBasicBlock *mbb = 0;

2
llvm/lib/CodeGen/LiveRangeEdit.cpp
View File

@ -414,6 +414,6 @@ LiveRangeEdit::calculateRegClassAndHint(MachineFunction &MF,
if (MRI.recomputeRegClass(LI.reg, MF.getTarget()))
DEBUG(dbgs() << "Inflated " << PrintReg(LI.reg) << " to "
<< MRI.getRegClass(LI.reg)->getName() << '\n');
VRAI.CalculateWeightAndHint(LI);
VRAI.calculateSpillWeightAndHint(LI);
}
}

6
llvm/lib/CodeGen/RegAllocBasic.cpp
View File

@ -278,9 +278,9 @@ bool RABasic::runOnMachineFunction(MachineFunction &mf) {
getAnalysis<LiveIntervals>(),
getAnalysis<LiveRegMatrix>());
calculateSpillWeights(*LIS, *MF,
getAnalysis<MachineLoopInfo>(),
getAnalysis<MachineBlockFrequencyInfo>());
calculateSpillWeightsAndHints(*LIS, *MF,
getAnalysis<MachineLoopInfo>(),
getAnalysis<MachineBlockFrequencyInfo>());
SpillerInstance.reset(createInlineSpiller(*this, *MF, *VRM));

2
llvm/lib/CodeGen/RegAllocGreedy.cpp
View File

@ -1838,7 +1838,7 @@ bool RAGreedy::runOnMachineFunction(MachineFunction &mf) {
SpillPlacer = &getAnalysis<SpillPlacement>();
DebugVars = &getAnalysis<LiveDebugVariables>();
calculateSpillWeights(*LIS, mf, *Loops, *MBFI);
calculateSpillWeightsAndHints(*LIS, mf, *Loops, *MBFI);
DEBUG(LIS->dump());

3
llvm/lib/CodeGen/RegAllocPBQP.cpp
View File

@ -549,7 +549,8 @@ bool RegAllocPBQP::runOnMachineFunction(MachineFunction &MF) {
lss = &getAnalysis<LiveStacks>();
mbfi = &getAnalysis<MachineBlockFrequencyInfo>();
calculateSpillWeights(*lis, MF, getAnalysis<MachineLoopInfo>(), *mbfi);
calculateSpillWeightsAndHints(*lis, MF, getAnalysis<MachineLoopInfo>(),
*mbfi);
vrm = &getAnalysis<VirtRegMap>();
spiller.reset(createInlineSpiller(*this, MF, *vrm));