RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-15 07:39:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Spillers may alter MachineLoopInfo when breaking critical edges, so make it

Browse Source 
non-const.

llvm-svn: 108734
This commit is contained in:
Jakob Stoklund Olesen 2010-07-19 18:41:20 +00:00
parent 0e5f8a53fd
commit 186d86d916
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/CodeGen/InlineSpiller.cpp
View File

@ -18,6 +18,7 @@
#include "llvm/CodeGen/LiveIntervalAnalysis.h"
#include "llvm/CodeGen/MachineFrameInfo.h"
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/CodeGen/MachineLoopInfo.h"
#include "llvm/CodeGen/MachineRegisterInfo.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetInstrInfo.h"
@ -30,6 +31,7 @@ namespace {
class InlineSpiller : public Spiller {
MachineFunction &mf_;
LiveIntervals &lis_;
MachineLoopInfo &loops_;
VirtRegMap &vrm_;
MachineFrameInfo &mfi_;
MachineRegisterInfo &mri_;
@ -53,8 +55,9 @@ class InlineSpiller : public Spiller {
~InlineSpiller() {}
public:
InlineSpiller(MachineFunction *mf, LiveIntervals *lis, VirtRegMap *vrm)
: mf_(*mf), lis_(*lis), vrm_(*vrm),
InlineSpiller(MachineFunction *mf, LiveIntervals *lis, MachineLoopInfo *mli,
VirtRegMap *vrm)
: mf_(*mf), lis_(*lis), loops_(*mli), vrm_(*vrm),
mfi_(*mf->getFrameInfo()),
mri_(mf->getRegInfo()),
tii_(*mf->getTarget().getInstrInfo()),
@ -82,9 +85,9 @@ private:
namespace llvm {
Spiller *createInlineSpiller(MachineFunction *mf,
LiveIntervals *lis,
const MachineLoopInfo *mli,
MachineLoopInfo *mli,
VirtRegMap *vrm) {
return new InlineSpiller(mf, lis, vrm);
return new InlineSpiller(mf, lis, mli, vrm);
}
}

4
lib/CodeGen/RegAllocLinearScan.cpp
View File

@ -127,7 +127,7 @@ namespace {
BitVector allocatableRegs_;
LiveIntervals* li_;
LiveStacks* ls_;
const MachineLoopInfo *loopInfo;
MachineLoopInfo *loopInfo;
/// handled_ - Intervals are added to the handled_ set in the order of their
/// start value. This is uses for backtracking.
@ -799,7 +799,7 @@ static void addStackInterval(LiveInterval *cur, LiveStacks *ls_,
static
float getConflictWeight(LiveInterval *cur, unsigned Reg, LiveIntervals *li_,
MachineRegisterInfo *mri_,
const MachineLoopInfo *loopInfo) {
MachineLoopInfo *loopInfo) {
float Conflicts = 0;
for (MachineRegisterInfo::reg_iterator I = mri_->reg_begin(Reg),
E = mri_->reg_end(); I != E; ++I) {

10
lib/CodeGen/Spiller.cpp
View File

@ -193,10 +193,10 @@ namespace {
class StandardSpiller : public Spiller {
protected:
LiveIntervals *lis;
const MachineLoopInfo *loopInfo;
MachineLoopInfo *loopInfo;
VirtRegMap *vrm;
public:
StandardSpiller(LiveIntervals *lis, const MachineLoopInfo *loopInfo,
StandardSpiller(LiveIntervals *lis, MachineLoopInfo *loopInfo,
VirtRegMap *vrm)
: lis(lis), loopInfo(loopInfo), vrm(vrm) {}
@ -222,7 +222,7 @@ namespace {
class SplittingSpiller : public StandardSpiller {
public:
SplittingSpiller(MachineFunction *mf, LiveIntervals *lis,
const MachineLoopInfo *loopInfo, VirtRegMap *vrm)
MachineLoopInfo *loopInfo, VirtRegMap *vrm)
: StandardSpiller(lis, loopInfo, vrm) {
mri = &mf->getRegInfo();
@ -508,12 +508,12 @@ private:
namespace llvm {
Spiller *createInlineSpiller(MachineFunction*,
LiveIntervals*,
const MachineLoopInfo*,
MachineLoopInfo*,
VirtRegMap*);
}
llvm::Spiller* llvm::createSpiller(MachineFunction *mf, LiveIntervals *lis,
const MachineLoopInfo *loopInfo,
MachineLoopInfo *loopInfo,
VirtRegMap *vrm) {
switch (spillerOpt) {
default: assert(0 && "unknown spiller");

2
lib/CodeGen/Spiller.h
View File

@ -51,7 +51,7 @@ namespace llvm {
/// Create and return a spiller object, as specified on the command line.
Spiller* createSpiller(MachineFunction *mf, LiveIntervals *li,
const MachineLoopInfo *loopInfo, VirtRegMap *vrm);
MachineLoopInfo *loopInfo, VirtRegMap *vrm);
}
#endif