2004-02-23 23:08:11 +00:00
|
|
|
//===-- llvm/CodeGen/VirtRegMap.cpp - Virtual Register Map ----------------===//
|
|
|
|
//
|
|
|
|
// 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.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
2004-09-30 01:54:45 +00:00
|
|
|
// This file implements the VirtRegMap class.
|
|
|
|
//
|
|
|
|
// It also contains implementations of the the Spiller interface, which, given a
|
|
|
|
// virtual register map and a machine function, eliminates all virtual
|
|
|
|
// references by replacing them with physical register references - adding spill
|
2004-02-24 08:58:30 +00:00
|
|
|
// code as necessary.
|
2004-02-23 23:08:11 +00:00
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
#define DEBUG_TYPE "spiller"
|
2004-02-23 23:08:11 +00:00
|
|
|
#include "VirtRegMap.h"
|
2004-02-24 08:58:30 +00:00
|
|
|
#include "llvm/Function.h"
|
2004-02-23 23:08:11 +00:00
|
|
|
#include "llvm/CodeGen/MachineFrameInfo.h"
|
2004-09-30 01:54:45 +00:00
|
|
|
#include "llvm/CodeGen/MachineFunction.h"
|
|
|
|
#include "llvm/CodeGen/SSARegMap.h"
|
2004-02-23 23:08:11 +00:00
|
|
|
#include "llvm/Target/TargetMachine.h"
|
2004-02-24 08:58:30 +00:00
|
|
|
#include "llvm/Target/TargetInstrInfo.h"
|
2004-09-01 22:55:40 +00:00
|
|
|
#include "llvm/Support/CommandLine.h"
|
|
|
|
#include "llvm/Support/Debug.h"
|
|
|
|
#include "llvm/ADT/Statistic.h"
|
|
|
|
#include "llvm/ADT/STLExtras.h"
|
2004-10-26 15:35:58 +00:00
|
|
|
#include <algorithm>
|
2004-02-23 23:08:11 +00:00
|
|
|
using namespace llvm;
|
|
|
|
|
|
|
|
namespace {
|
2004-09-30 01:54:45 +00:00
|
|
|
Statistic<> NumSpills("spiller", "Number of register spills");
|
|
|
|
Statistic<> NumStores("spiller", "Number of stores added");
|
|
|
|
Statistic<> NumLoads ("spiller", "Number of loads added");
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
Statistic<> NumReused("spiller", "Number of values reused");
|
2004-10-01 19:47:12 +00:00
|
|
|
Statistic<> NumDSE ("spiller", "Number of dead stores elided");
|
2004-09-30 01:54:45 +00:00
|
|
|
|
|
|
|
enum SpillerName { simple, local };
|
|
|
|
|
|
|
|
cl::opt<SpillerName>
|
|
|
|
SpillerOpt("spiller",
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
cl::desc("Spiller to use: (default: local)"),
|
2004-09-30 01:54:45 +00:00
|
|
|
cl::Prefix,
|
|
|
|
cl::values(clEnumVal(simple, " simple spiller"),
|
|
|
|
clEnumVal(local, " local spiller"),
|
|
|
|
clEnumValEnd),
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
cl::init(local));
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// VirtRegMap implementation
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
void VirtRegMap::grow() {
|
2004-09-30 02:15:18 +00:00
|
|
|
Virt2PhysMap.grow(MF.getSSARegMap()->getLastVirtReg());
|
|
|
|
Virt2StackSlotMap.grow(MF.getSSARegMap()->getLastVirtReg());
|
2004-02-23 23:08:11 +00:00
|
|
|
}
|
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
int VirtRegMap::assignVirt2StackSlot(unsigned virtReg) {
|
|
|
|
assert(MRegisterInfo::isVirtualRegister(virtReg));
|
2004-09-30 02:15:18 +00:00
|
|
|
assert(Virt2StackSlotMap[virtReg] == NO_STACK_SLOT &&
|
2004-09-30 01:54:45 +00:00
|
|
|
"attempt to assign stack slot to already spilled register");
|
2004-09-30 02:15:18 +00:00
|
|
|
const TargetRegisterClass* RC = MF.getSSARegMap()->getRegClass(virtReg);
|
|
|
|
int frameIndex = MF.getFrameInfo()->CreateStackObject(RC->getSize(),
|
|
|
|
RC->getAlignment());
|
|
|
|
Virt2StackSlotMap[virtReg] = frameIndex;
|
2004-09-30 01:54:45 +00:00
|
|
|
++NumSpills;
|
|
|
|
return frameIndex;
|
2004-02-23 23:08:11 +00:00
|
|
|
}
|
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
void VirtRegMap::assignVirt2StackSlot(unsigned virtReg, int frameIndex) {
|
|
|
|
assert(MRegisterInfo::isVirtualRegister(virtReg));
|
2004-09-30 02:15:18 +00:00
|
|
|
assert(Virt2StackSlotMap[virtReg] == NO_STACK_SLOT &&
|
2004-09-30 01:54:45 +00:00
|
|
|
"attempt to assign stack slot to already spilled register");
|
2004-09-30 02:15:18 +00:00
|
|
|
Virt2StackSlotMap[virtReg] = frameIndex;
|
2004-05-29 20:38:05 +00:00
|
|
|
}
|
|
|
|
|
2004-10-01 23:15:36 +00:00
|
|
|
void VirtRegMap::virtFolded(unsigned VirtReg, MachineInstr *OldMI,
|
|
|
|
unsigned OpNo, MachineInstr *NewMI) {
|
|
|
|
// Move previous memory references folded to new instruction.
|
|
|
|
MI2VirtMapTy::iterator IP = MI2VirtMap.lower_bound(NewMI);
|
|
|
|
for (MI2VirtMapTy::iterator I = MI2VirtMap.lower_bound(OldMI),
|
|
|
|
E = MI2VirtMap.end(); I != E && I->first == OldMI; ) {
|
|
|
|
MI2VirtMap.insert(IP, std::make_pair(NewMI, I->second));
|
2004-09-30 16:35:08 +00:00
|
|
|
MI2VirtMap.erase(I++);
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
2004-09-30 16:35:08 +00:00
|
|
|
|
2004-10-01 23:15:36 +00:00
|
|
|
ModRef MRInfo;
|
|
|
|
if (!OldMI->getOperand(OpNo).isDef()) {
|
|
|
|
assert(OldMI->getOperand(OpNo).isUse() && "Operand is not use or def?");
|
|
|
|
MRInfo = isRef;
|
|
|
|
} else {
|
|
|
|
MRInfo = OldMI->getOperand(OpNo).isUse() ? isModRef : isMod;
|
|
|
|
}
|
2004-09-30 01:54:45 +00:00
|
|
|
|
|
|
|
// add new memory reference
|
2004-10-01 23:15:36 +00:00
|
|
|
MI2VirtMap.insert(IP, std::make_pair(NewMI, std::make_pair(VirtReg, MRInfo)));
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
2004-03-01 20:05:10 +00:00
|
|
|
|
2004-09-30 02:15:18 +00:00
|
|
|
void VirtRegMap::print(std::ostream &OS) const {
|
|
|
|
const MRegisterInfo* MRI = MF.getTarget().getRegisterInfo();
|
2004-09-30 01:54:45 +00:00
|
|
|
|
2004-09-30 02:15:18 +00:00
|
|
|
OS << "********** REGISTER MAP **********\n";
|
2004-09-30 01:54:45 +00:00
|
|
|
for (unsigned i = MRegisterInfo::FirstVirtualRegister,
|
2004-09-30 02:15:18 +00:00
|
|
|
e = MF.getSSARegMap()->getLastVirtReg(); i <= e; ++i) {
|
|
|
|
if (Virt2PhysMap[i] != (unsigned)VirtRegMap::NO_PHYS_REG)
|
|
|
|
OS << "[reg" << i << " -> " << MRI->getName(Virt2PhysMap[i]) << "]\n";
|
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for (unsigned i = MRegisterInfo::FirstVirtualRegister,
|
2004-09-30 02:15:18 +00:00
|
|
|
e = MF.getSSARegMap()->getLastVirtReg(); i <= e; ++i)
|
|
|
|
if (Virt2StackSlotMap[i] != VirtRegMap::NO_STACK_SLOT)
|
|
|
|
OS << "[reg" << i << " -> fi#" << Virt2StackSlotMap[i] << "]\n";
|
|
|
|
OS << '\n';
|
2004-03-01 20:05:10 +00:00
|
|
|
}
|
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
void VirtRegMap::dump() const { print(std::cerr); }
|
2004-02-23 23:08:11 +00:00
|
|
|
|
2004-02-24 08:58:30 +00:00
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// Simple Spiller Implementation
|
|
|
|
//===----------------------------------------------------------------------===//
|
2004-03-01 23:18:15 +00:00
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
Spiller::~Spiller() {}
|
2004-03-01 23:18:15 +00:00
|
|
|
|
2004-02-24 08:58:30 +00:00
|
|
|
namespace {
|
2004-09-30 01:54:45 +00:00
|
|
|
struct SimpleSpiller : public Spiller {
|
|
|
|
bool runOnMachineFunction(MachineFunction& mf, const VirtRegMap &VRM);
|
|
|
|
};
|
|
|
|
}
|
2004-02-24 08:58:30 +00:00
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
bool SimpleSpiller::runOnMachineFunction(MachineFunction& MF,
|
|
|
|
const VirtRegMap& VRM) {
|
|
|
|
DEBUG(std::cerr << "********** REWRITE MACHINE CODE **********\n");
|
|
|
|
DEBUG(std::cerr << "********** Function: "
|
|
|
|
<< MF.getFunction()->getName() << '\n');
|
|
|
|
const TargetMachine& TM = MF.getTarget();
|
2004-09-30 02:15:18 +00:00
|
|
|
const MRegisterInfo& MRI = *TM.getRegisterInfo();
|
2004-09-30 01:54:45 +00:00
|
|
|
|
2004-09-30 02:33:48 +00:00
|
|
|
// LoadedRegs - Keep track of which vregs are loaded, so that we only load
|
|
|
|
// each vreg once (in the case where a spilled vreg is used by multiple
|
|
|
|
// operands). This is always smaller than the number of operands to the
|
|
|
|
// current machine instr, so it should be small.
|
|
|
|
std::vector<unsigned> LoadedRegs;
|
2004-09-30 01:54:45 +00:00
|
|
|
|
2004-09-30 02:59:33 +00:00
|
|
|
for (MachineFunction::iterator MBBI = MF.begin(), E = MF.end();
|
|
|
|
MBBI != E; ++MBBI) {
|
|
|
|
DEBUG(std::cerr << MBBI->getBasicBlock()->getName() << ":\n");
|
|
|
|
MachineBasicBlock &MBB = *MBBI;
|
|
|
|
for (MachineBasicBlock::iterator MII = MBB.begin(),
|
|
|
|
E = MBB.end(); MII != E; ++MII) {
|
|
|
|
MachineInstr &MI = *MII;
|
|
|
|
for (unsigned i = 0, e = MI.getNumOperands(); i != e; ++i) {
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
MachineOperand &MO = MI.getOperand(i);
|
|
|
|
if (MO.isRegister() && MO.getReg() &&
|
|
|
|
MRegisterInfo::isVirtualRegister(MO.getReg())) {
|
|
|
|
unsigned VirtReg = MO.getReg();
|
2004-09-30 02:59:33 +00:00
|
|
|
unsigned PhysReg = VRM.getPhys(VirtReg);
|
|
|
|
if (VRM.hasStackSlot(VirtReg)) {
|
2004-09-30 16:10:45 +00:00
|
|
|
int StackSlot = VRM.getStackSlot(VirtReg);
|
2004-09-30 02:59:33 +00:00
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
if (MO.isUse() &&
|
2004-09-30 02:59:33 +00:00
|
|
|
std::find(LoadedRegs.begin(), LoadedRegs.end(), VirtReg)
|
|
|
|
== LoadedRegs.end()) {
|
|
|
|
MRI.loadRegFromStackSlot(MBB, &MI, PhysReg, StackSlot);
|
|
|
|
LoadedRegs.push_back(VirtReg);
|
|
|
|
++NumLoads;
|
2004-09-30 16:10:45 +00:00
|
|
|
DEBUG(std::cerr << '\t' << *prior(MII));
|
2004-09-30 02:59:33 +00:00
|
|
|
}
|
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
if (MO.isDef()) {
|
|
|
|
MRI.storeRegToStackSlot(MBB, next(MII), PhysReg, StackSlot);
|
2004-09-30 02:59:33 +00:00
|
|
|
++NumStores;
|
|
|
|
}
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
2004-09-30 02:59:33 +00:00
|
|
|
MI.SetMachineOperandReg(i, PhysReg);
|
2004-02-24 08:58:30 +00:00
|
|
|
}
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
2004-09-30 16:10:45 +00:00
|
|
|
DEBUG(std::cerr << '\t' << MI);
|
2004-09-30 02:33:48 +00:00
|
|
|
LoadedRegs.clear();
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
2004-02-24 08:58:30 +00:00
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// Local Spiller Implementation
|
|
|
|
//===----------------------------------------------------------------------===//
|
2004-02-24 08:58:30 +00:00
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
namespace {
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
/// LocalSpiller - This spiller does a simple pass over the machine basic
|
|
|
|
/// block to attempt to keep spills in registers as much as possible for
|
|
|
|
/// blocks that have low register pressure (the vreg may be spilled due to
|
|
|
|
/// register pressure in other blocks).
|
2004-09-30 01:54:45 +00:00
|
|
|
class LocalSpiller : public Spiller {
|
|
|
|
const MRegisterInfo *MRI;
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
const TargetInstrInfo *TII;
|
2004-09-30 01:54:45 +00:00
|
|
|
public:
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
bool runOnMachineFunction(MachineFunction &MF, const VirtRegMap &VRM) {
|
|
|
|
MRI = MF.getTarget().getRegisterInfo();
|
|
|
|
TII = MF.getTarget().getInstrInfo();
|
|
|
|
DEBUG(std::cerr << "\n**** Local spiller rewriting function '"
|
|
|
|
<< MF.getFunction()->getName() << "':\n");
|
|
|
|
|
|
|
|
for (MachineFunction::iterator MBB = MF.begin(), E = MF.end();
|
|
|
|
MBB != E; ++MBB)
|
|
|
|
RewriteMBB(*MBB, VRM);
|
|
|
|
return true;
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
private:
|
|
|
|
void RewriteMBB(MachineBasicBlock &MBB, const VirtRegMap &VRM);
|
|
|
|
void ClobberPhysReg(unsigned PR, std::map<int, unsigned> &SpillSlots,
|
|
|
|
std::map<unsigned, int> &PhysRegs);
|
|
|
|
void ClobberPhysRegOnly(unsigned PR, std::map<int, unsigned> &SpillSlots,
|
|
|
|
std::map<unsigned, int> &PhysRegs);
|
2004-09-30 01:54:45 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
void LocalSpiller::ClobberPhysRegOnly(unsigned PhysReg,
|
|
|
|
std::map<int, unsigned> &SpillSlots,
|
|
|
|
std::map<unsigned, int> &PhysRegs) {
|
|
|
|
std::map<unsigned, int>::iterator I = PhysRegs.find(PhysReg);
|
|
|
|
if (I != PhysRegs.end()) {
|
|
|
|
int Slot = I->second;
|
|
|
|
PhysRegs.erase(I);
|
|
|
|
assert(SpillSlots[Slot] == PhysReg && "Bidirectional map mismatch!");
|
|
|
|
SpillSlots.erase(Slot);
|
|
|
|
DEBUG(std::cerr << "PhysReg " << MRI->getName(PhysReg)
|
|
|
|
<< " clobbered, invalidating SS#" << Slot << "\n");
|
2004-09-30 01:54:45 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
}
|
2004-02-24 08:58:30 +00:00
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
void LocalSpiller::ClobberPhysReg(unsigned PhysReg,
|
|
|
|
std::map<int, unsigned> &SpillSlots,
|
|
|
|
std::map<unsigned, int> &PhysRegs) {
|
|
|
|
for (const unsigned *AS = MRI->getAliasSet(PhysReg); *AS; ++AS)
|
|
|
|
ClobberPhysRegOnly(*AS, SpillSlots, PhysRegs);
|
|
|
|
ClobberPhysRegOnly(PhysReg, SpillSlots, PhysRegs);
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
// ReusedOp - For each reused operand, we keep track of a bit of information, in
|
|
|
|
// case we need to rollback upon processing a new operand. See comments below.
|
|
|
|
namespace {
|
|
|
|
struct ReusedOp {
|
|
|
|
// The MachineInstr operand that reused an available value.
|
|
|
|
unsigned Operand;
|
|
|
|
|
|
|
|
// StackSlot - The spill slot of the value being reused.
|
|
|
|
unsigned StackSlot;
|
|
|
|
|
|
|
|
// PhysRegReused - The physical register the value was available in.
|
|
|
|
unsigned PhysRegReused;
|
|
|
|
|
|
|
|
// AssignedPhysReg - The physreg that was assigned for use by the reload.
|
|
|
|
unsigned AssignedPhysReg;
|
|
|
|
|
|
|
|
ReusedOp(unsigned o, unsigned ss, unsigned prr, unsigned apr)
|
|
|
|
: Operand(o), StackSlot(ss), PhysRegReused(prr), AssignedPhysReg(apr) {}
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// rewriteMBB - Keep track of which spills are available even after the
|
|
|
|
/// register allocator is done with them. If possible, avoid reloading vregs.
|
|
|
|
void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, const VirtRegMap &VRM) {
|
|
|
|
|
|
|
|
// SpillSlotsAvailable - This map keeps track of all of the spilled virtual
|
|
|
|
// register values that are still available, due to being loaded to stored to,
|
|
|
|
// but not invalidated yet.
|
|
|
|
std::map<int, unsigned> SpillSlotsAvailable;
|
|
|
|
|
|
|
|
// PhysRegsAvailable - This is the inverse of SpillSlotsAvailable, indicating
|
|
|
|
// which physregs are in use holding a stack slot value.
|
|
|
|
std::map<unsigned, int> PhysRegsAvailable;
|
|
|
|
|
|
|
|
DEBUG(std::cerr << MBB.getBasicBlock()->getName() << ":\n");
|
|
|
|
|
|
|
|
std::vector<ReusedOp> ReusedOperands;
|
|
|
|
|
|
|
|
// DefAndUseVReg - When we see a def&use operand that is spilled, keep track
|
|
|
|
// of it. ".first" is the machine operand index (should always be 0 for now),
|
|
|
|
// and ".second" is the virtual register that is spilled.
|
|
|
|
std::vector<std::pair<unsigned, unsigned> > DefAndUseVReg;
|
|
|
|
|
2004-10-01 19:47:12 +00:00
|
|
|
// MaybeDeadStores - When we need to write a value back into a stack slot,
|
|
|
|
// keep track of the inserted store. If the stack slot value is never read
|
|
|
|
// (because the value was used from some available register, for example), and
|
|
|
|
// subsequently stored to, the original store is dead. This map keeps track
|
|
|
|
// of inserted stores that are not used. If we see a subsequent store to the
|
|
|
|
// same stack slot, the original store is deleted.
|
|
|
|
std::map<int, MachineInstr*> MaybeDeadStores;
|
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
for (MachineBasicBlock::iterator MII = MBB.begin(), E = MBB.end();
|
|
|
|
MII != E; ) {
|
|
|
|
MachineInstr &MI = *MII;
|
|
|
|
MachineBasicBlock::iterator NextMII = MII; ++NextMII;
|
|
|
|
|
|
|
|
ReusedOperands.clear();
|
|
|
|
DefAndUseVReg.clear();
|
|
|
|
|
|
|
|
// Process all of the spilled uses and all non spilled reg references.
|
|
|
|
for (unsigned i = 0, e = MI.getNumOperands(); i != e; ++i) {
|
|
|
|
MachineOperand &MO = MI.getOperand(i);
|
|
|
|
if (MO.isRegister() && MO.getReg() &&
|
|
|
|
MRegisterInfo::isVirtualRegister(MO.getReg())) {
|
|
|
|
unsigned VirtReg = MO.getReg();
|
|
|
|
|
|
|
|
if (!VRM.hasStackSlot(VirtReg)) {
|
|
|
|
// This virtual register was assigned a physreg!
|
|
|
|
MI.SetMachineOperandReg(i, VRM.getPhys(VirtReg));
|
|
|
|
} else {
|
|
|
|
// Is this virtual register a spilled value?
|
|
|
|
if (MO.isUse()) {
|
|
|
|
int StackSlot = VRM.getStackSlot(VirtReg);
|
|
|
|
unsigned PhysReg;
|
|
|
|
|
|
|
|
// Check to see if this stack slot is available.
|
|
|
|
std::map<int, unsigned>::iterator SSI =
|
|
|
|
SpillSlotsAvailable.find(StackSlot);
|
|
|
|
if (SSI != SpillSlotsAvailable.end()) {
|
2004-10-15 03:16:29 +00:00
|
|
|
DEBUG(std::cerr << "Reusing SS#" << StackSlot << " from physreg "
|
|
|
|
<< MRI->getName(SSI->second) << " for vreg"
|
|
|
|
<< VirtReg <<" instead of reloading into physreg "
|
|
|
|
<< MRI->getName(VRM.getPhys(VirtReg)) << "\n");
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
// If this stack slot value is already available, reuse it!
|
|
|
|
PhysReg = SSI->second;
|
|
|
|
MI.SetMachineOperandReg(i, PhysReg);
|
|
|
|
|
|
|
|
// The only technical detail we have is that we don't know that
|
|
|
|
// PhysReg won't be clobbered by a reloaded stack slot that occurs
|
|
|
|
// later in the instruction. In particular, consider 'op V1, V2'.
|
|
|
|
// If V1 is available in physreg R0, we would choose to reuse it
|
|
|
|
// here, instead of reloading it into the register the allocator
|
|
|
|
// indicated (say R1). However, V2 might have to be reloaded
|
|
|
|
// later, and it might indicate that it needs to live in R0. When
|
|
|
|
// this occurs, we need to have information available that
|
|
|
|
// indicates it is safe to use R1 for the reload instead of R0.
|
|
|
|
//
|
|
|
|
// To further complicate matters, we might conflict with an alias,
|
|
|
|
// or R0 and R1 might not be compatible with each other. In this
|
|
|
|
// case, we actually insert a reload for V1 in R1, ensuring that
|
|
|
|
// we can get at R0 or its alias.
|
|
|
|
ReusedOperands.push_back(ReusedOp(i, StackSlot, PhysReg,
|
|
|
|
VRM.getPhys(VirtReg)));
|
|
|
|
++NumReused;
|
|
|
|
} else {
|
|
|
|
// Otherwise, reload it and remember that we have it.
|
|
|
|
PhysReg = VRM.getPhys(VirtReg);
|
|
|
|
|
This patch fixes the nasty bug that caused 175.vpr to fail for X86 last night.
The problem occurred when trying to reload this instruction:
MOV32mr %reg2326, 8, %reg2297, 4, %reg2295
The value of reg2326 was available in EBX, so it was reused from there, instead
of reloading it into EDX.
The value of reg2297 was available in EDX, so it was reused from there, instead
of reloading it into EDI.
The value of reg2295 was not available, so we tried reloading it into EBX, its
assigned register. However, we checked and saw that we already reloaded
something into EBX, so we chose what reg2326 was assigned to (EDX) and reloaded
into that register instead.
Unfortunately EDX had already been used by reg2297, so reloading into EDX
clobbered the value used by the reg2326 operand, breaking the program.
The fix for this is to check that the newly picked register is ok. In this
case we now find that EDX is already used and try using EDI, which succeeds.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17006 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-15 03:19:31 +00:00
|
|
|
RecheckRegister:
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
// Note that, if we reused a register for a previous operand, the
|
|
|
|
// register we want to reload into might not actually be
|
|
|
|
// available. If this occurs, use the register indicated by the
|
|
|
|
// reuser.
|
|
|
|
if (!ReusedOperands.empty()) // This is most often empty.
|
|
|
|
for (unsigned ro = 0, e = ReusedOperands.size(); ro != e; ++ro)
|
|
|
|
if (ReusedOperands[ro].PhysRegReused == PhysReg) {
|
|
|
|
// Yup, use the reload register that we didn't use before.
|
|
|
|
PhysReg = ReusedOperands[ro].AssignedPhysReg;
|
This patch fixes the nasty bug that caused 175.vpr to fail for X86 last night.
The problem occurred when trying to reload this instruction:
MOV32mr %reg2326, 8, %reg2297, 4, %reg2295
The value of reg2326 was available in EBX, so it was reused from there, instead
of reloading it into EDX.
The value of reg2297 was available in EDX, so it was reused from there, instead
of reloading it into EDI.
The value of reg2295 was not available, so we tried reloading it into EBX, its
assigned register. However, we checked and saw that we already reloaded
something into EBX, so we chose what reg2326 was assigned to (EDX) and reloaded
into that register instead.
Unfortunately EDX had already been used by reg2297, so reloading into EDX
clobbered the value used by the reg2326 operand, breaking the program.
The fix for this is to check that the newly picked register is ok. In this
case we now find that EDX is already used and try using EDI, which succeeds.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17006 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-15 03:19:31 +00:00
|
|
|
goto RecheckRegister;
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
} else {
|
|
|
|
ReusedOp &Op = ReusedOperands[ro];
|
|
|
|
unsigned PRRU = Op.PhysRegReused;
|
|
|
|
for (const unsigned *AS = MRI->getAliasSet(PRRU); *AS; ++AS)
|
|
|
|
if (*AS == PhysReg) {
|
|
|
|
// Okay, we found out that an alias of a reused register
|
|
|
|
// was used. This isn't good because it means we have
|
|
|
|
// to undo a previous reuse.
|
|
|
|
MRI->loadRegFromStackSlot(MBB, &MI, Op.AssignedPhysReg,
|
|
|
|
Op.StackSlot);
|
|
|
|
ClobberPhysReg(Op.AssignedPhysReg, SpillSlotsAvailable,
|
|
|
|
PhysRegsAvailable);
|
|
|
|
|
2004-10-01 19:47:12 +00:00
|
|
|
// Any stores to this stack slot are not dead anymore.
|
|
|
|
MaybeDeadStores.erase(Op.StackSlot);
|
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
MI.SetMachineOperandReg(Op.Operand, Op.AssignedPhysReg);
|
|
|
|
PhysRegsAvailable[Op.AssignedPhysReg] = Op.StackSlot;
|
|
|
|
SpillSlotsAvailable[Op.StackSlot] = Op.AssignedPhysReg;
|
|
|
|
PhysRegsAvailable.erase(Op.PhysRegReused);
|
|
|
|
DEBUG(std::cerr << "Remembering SS#" << Op.StackSlot
|
|
|
|
<< " in physreg "
|
|
|
|
<< MRI->getName(Op.AssignedPhysReg) << "\n");
|
|
|
|
++NumLoads;
|
|
|
|
DEBUG(std::cerr << '\t' << *prior(MII));
|
|
|
|
|
|
|
|
DEBUG(std::cerr << "Reuse undone!\n");
|
|
|
|
ReusedOperands.erase(ReusedOperands.begin()+ro);
|
|
|
|
--NumReused;
|
|
|
|
goto ContinueReload;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ContinueReload:
|
|
|
|
|
|
|
|
MRI->loadRegFromStackSlot(MBB, &MI, PhysReg, StackSlot);
|
|
|
|
// This invalidates PhysReg.
|
|
|
|
ClobberPhysReg(PhysReg, SpillSlotsAvailable, PhysRegsAvailable);
|
|
|
|
|
2004-10-01 19:47:12 +00:00
|
|
|
// Any stores to this stack slot are not dead anymore.
|
|
|
|
MaybeDeadStores.erase(StackSlot);
|
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
MI.SetMachineOperandReg(i, PhysReg);
|
|
|
|
PhysRegsAvailable[PhysReg] = StackSlot;
|
|
|
|
SpillSlotsAvailable[StackSlot] = PhysReg;
|
|
|
|
DEBUG(std::cerr << "Remembering SS#" << StackSlot <<" in physreg "
|
|
|
|
<< MRI->getName(PhysReg) << "\n");
|
|
|
|
++NumLoads;
|
|
|
|
DEBUG(std::cerr << '\t' << *prior(MII));
|
|
|
|
}
|
|
|
|
|
|
|
|
// If this is both a def and a use, we need to emit a store to the
|
|
|
|
// stack slot after the instruction. Keep track of D&U operands
|
|
|
|
// because we already changed it to a physreg here.
|
|
|
|
if (MO.isDef()) {
|
|
|
|
// Remember that this was a def-and-use operand, and that the
|
|
|
|
// stack slot is live after this instruction executes.
|
|
|
|
DefAndUseVReg.push_back(std::make_pair(i, VirtReg));
|
|
|
|
}
|
|
|
|
}
|
2004-02-24 08:58:30 +00:00
|
|
|
}
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
|
|
|
}
|
2004-02-24 08:58:30 +00:00
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
// Loop over all of the implicit defs, clearing them from our available
|
|
|
|
// sets.
|
|
|
|
const TargetInstrDescriptor &InstrDesc = TII->get(MI.getOpcode());
|
|
|
|
for (const unsigned* ImpDef = InstrDesc.ImplicitDefs; *ImpDef; ++ImpDef)
|
|
|
|
ClobberPhysReg(*ImpDef, SpillSlotsAvailable, PhysRegsAvailable);
|
|
|
|
|
|
|
|
DEBUG(std::cerr << '\t' << MI);
|
|
|
|
|
|
|
|
// If we have folded references to memory operands, make sure we clear all
|
|
|
|
// physical registers that may contain the value of the spilled virtual
|
|
|
|
// register
|
|
|
|
VirtRegMap::MI2VirtMapTy::const_iterator I, E;
|
|
|
|
for (tie(I, E) = VRM.getFoldedVirts(&MI); I != E; ++I) {
|
2004-10-01 23:15:36 +00:00
|
|
|
DEBUG(std::cerr << "Folded vreg: " << I->second.first << " MR: "
|
|
|
|
<< I->second.second);
|
|
|
|
unsigned VirtReg = I->second.first;
|
|
|
|
VirtRegMap::ModRef MR = I->second.second;
|
|
|
|
if (VRM.hasStackSlot(VirtReg)) {
|
|
|
|
int SS = VRM.getStackSlot(VirtReg);
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
DEBUG(std::cerr << " - StackSlot: " << SS << "\n");
|
|
|
|
|
2004-10-01 23:15:36 +00:00
|
|
|
// If this reference is not a use, any previous store is now dead.
|
|
|
|
// Otherwise, the store to this stack slot is not dead anymore.
|
|
|
|
std::map<int, MachineInstr*>::iterator MDSI = MaybeDeadStores.find(SS);
|
|
|
|
if (MDSI != MaybeDeadStores.end()) {
|
|
|
|
if (MR & VirtRegMap::isRef) // Previous store is not dead.
|
2004-10-01 23:16:43 +00:00
|
|
|
MaybeDeadStores.erase(MDSI);
|
2004-10-01 23:15:36 +00:00
|
|
|
else {
|
|
|
|
// If we get here, the store is dead, nuke it now.
|
|
|
|
assert(MR == VirtRegMap::isMod && "Can't be modref!");
|
|
|
|
MBB.erase(MDSI->second);
|
|
|
|
MaybeDeadStores.erase(MDSI);
|
|
|
|
++NumDSE;
|
|
|
|
}
|
|
|
|
}
|
2004-10-01 19:47:12 +00:00
|
|
|
|
2004-10-01 23:15:36 +00:00
|
|
|
// If the spill slot value is available, and this is a new definition of
|
|
|
|
// the value, the value is not available anymore.
|
|
|
|
if (MR & VirtRegMap::isMod) {
|
|
|
|
std::map<int, unsigned>::iterator It = SpillSlotsAvailable.find(SS);
|
|
|
|
if (It != SpillSlotsAvailable.end()) {
|
|
|
|
PhysRegsAvailable.erase(It->second);
|
|
|
|
SpillSlotsAvailable.erase(It);
|
|
|
|
}
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
DEBUG(std::cerr << ": No stack slot!\n");
|
|
|
|
}
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
2004-02-24 08:58:30 +00:00
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
// Process all of the spilled defs.
|
|
|
|
for (unsigned i = 0, e = MI.getNumOperands(); i != e; ++i) {
|
|
|
|
MachineOperand &MO = MI.getOperand(i);
|
|
|
|
if (MO.isRegister() && MO.getReg() && MO.isDef()) {
|
|
|
|
unsigned VirtReg = MO.getReg();
|
|
|
|
|
|
|
|
bool TakenCareOf = false;
|
|
|
|
if (!MRegisterInfo::isVirtualRegister(VirtReg)) {
|
|
|
|
// Check to see if this is a def-and-use vreg operand that we do need
|
|
|
|
// to insert a store for.
|
|
|
|
bool OpTakenCareOf = false;
|
|
|
|
if (MO.isUse() && !DefAndUseVReg.empty()) {
|
|
|
|
for (unsigned dau = 0, e = DefAndUseVReg.size(); dau != e; ++dau)
|
|
|
|
if (DefAndUseVReg[dau].first == i) {
|
|
|
|
VirtReg = DefAndUseVReg[dau].second;
|
|
|
|
OpTakenCareOf = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!OpTakenCareOf) {
|
|
|
|
ClobberPhysReg(VirtReg, SpillSlotsAvailable, PhysRegsAvailable);
|
|
|
|
TakenCareOf = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!TakenCareOf) {
|
|
|
|
// The only vregs left are stack slot definitions.
|
|
|
|
int StackSlot = VRM.getStackSlot(VirtReg);
|
|
|
|
unsigned PhysReg;
|
|
|
|
|
|
|
|
// If this is a def&use operand, and we used a different physreg for
|
|
|
|
// it than the one assigned, make sure to execute the store from the
|
|
|
|
// correct physical register.
|
|
|
|
if (MO.getReg() == VirtReg)
|
|
|
|
PhysReg = VRM.getPhys(VirtReg);
|
|
|
|
else
|
|
|
|
PhysReg = MO.getReg();
|
|
|
|
|
|
|
|
MRI->storeRegToStackSlot(MBB, next(MII), PhysReg, StackSlot);
|
|
|
|
DEBUG(std::cerr << "Store:\t" << *next(MII));
|
|
|
|
MI.SetMachineOperandReg(i, PhysReg);
|
|
|
|
|
2004-10-01 19:47:12 +00:00
|
|
|
// If there is a dead store to this stack slot, nuke it now.
|
|
|
|
MachineInstr *&LastStore = MaybeDeadStores[StackSlot];
|
|
|
|
if (LastStore) {
|
2004-10-15 03:16:29 +00:00
|
|
|
DEBUG(std::cerr << " Killed store:\t" << *LastStore);
|
2004-10-01 19:47:12 +00:00
|
|
|
++NumDSE;
|
|
|
|
MBB.erase(LastStore);
|
|
|
|
}
|
|
|
|
LastStore = next(MII);
|
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
// If the stack slot value was previously available in some other
|
|
|
|
// register, change it now. Otherwise, make the register available,
|
|
|
|
// in PhysReg.
|
|
|
|
std::map<int, unsigned>::iterator SSA =
|
|
|
|
SpillSlotsAvailable.find(StackSlot);
|
|
|
|
if (SSA != SpillSlotsAvailable.end()) {
|
|
|
|
// Remove the record for physreg.
|
|
|
|
PhysRegsAvailable.erase(SSA->second);
|
|
|
|
SpillSlotsAvailable.erase(SSA);
|
|
|
|
}
|
|
|
|
ClobberPhysReg(PhysReg, SpillSlotsAvailable, PhysRegsAvailable);
|
|
|
|
|
|
|
|
PhysRegsAvailable[PhysReg] = StackSlot;
|
|
|
|
SpillSlotsAvailable[StackSlot] = PhysReg;
|
|
|
|
DEBUG(std::cerr << "Updating SS#" << StackSlot <<" in physreg "
|
2004-10-15 03:16:29 +00:00
|
|
|
<< MRI->getName(PhysReg) << " for virtreg #"
|
|
|
|
<< VirtReg << "\n");
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
|
|
|
|
++NumStores;
|
|
|
|
VirtReg = PhysReg;
|
2004-02-24 08:58:30 +00:00
|
|
|
}
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
}
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
MII = NextMII;
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
2004-02-24 08:58:30 +00:00
|
|
|
}
|
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
|
Substantially revamp the local spiller, causing it to actually improve the
generated code over the simple spiller. The new local spiller generates
substantially better code than the simple one in some cases, by reusing
values that are loaded out of stack slots and kept available in registers.
This primarily helps programs that are spilling a lot, and there is still
stuff that can be done to improve it. This patch makes the local spiller
the default, as it's only a tiny bit slower than the simple spiller (it
increases the runtime of llc by < 1%).
Here are some numbers with speedups.
Program #reuse old(s) new(s) Speedup
Povray: 3452, 16.87 -> 15.93 (5.5%)
177.mesa: 2176, 2.77 -> 2.76 (0%)
179.art: 35, 28.43 -> 28.01 (1.5%)
183.equake: 55, 61.44 -> 61.41 (0%)
188.ammp: 869, 174 -> 149 (15%)
164.gzip: 43, 40.73 -> 40.71 (0%)
175.vpr: 351, 18.54 -> 17.34 (6.5%)
176.gcc: 2471, 5.01 -> 4.92 (1.8%)
181.mcf 42, 79.30 -> 75.20 (5.2%)
186.crafty: 484, 29.73 -> 30.04 (-1%)
197.parser: 251, 10.47 -> 10.67 (-1%)
252.eon: 1501, 1.98 -> 1.75 (12%)
253.perlbm: 1183, 14.83 -> 14.42 (2.8%)
254.gap: 825, 7.46 -> 7.29 (2.3%)
255.vortex: 285, 10.51 -> 10.27 (2.3%)
256.bzip2: 63, 55.70 -> 55.20 (0.9%)
300.twolf: 830, 21.63 -> 22.00 (-1%)
PtrDist/ks 14, 32.75 -> 17.53 (46.5%)
Olden/tsp 46, 8.71 -> 8.24 (5.4%)
Free/distray 70, 1.09 -> 0.99 (9.2%)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16629 91177308-0d34-0410-b5e6-96231b3b80d8
2004-10-01 19:04:51 +00:00
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
llvm::Spiller* llvm::createSpiller() {
|
|
|
|
switch (SpillerOpt) {
|
|
|
|
default: assert(0 && "Unreachable!");
|
|
|
|
case local:
|
|
|
|
return new LocalSpiller();
|
|
|
|
case simple:
|
|
|
|
return new SimpleSpiller();
|
|
|
|
}
|
2004-02-24 08:58:30 +00:00
|
|
|
}
|