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"
|
2006-08-27 12:54:02 +00:00
|
|
|
#include "llvm/Support/Compiler.h"
|
2007-02-21 02:22:03 +00:00
|
|
|
#include "llvm/ADT/BitVector.h"
|
2004-09-01 22:55:40 +00:00
|
|
|
#include "llvm/ADT/Statistic.h"
|
|
|
|
#include "llvm/ADT/STLExtras.h"
|
2007-01-23 00:59:48 +00:00
|
|
|
#include "llvm/ADT/SmallSet.h"
|
2004-10-26 15:35:58 +00:00
|
|
|
#include <algorithm>
|
2004-02-23 23:08:11 +00:00
|
|
|
using namespace llvm;
|
|
|
|
|
2006-12-19 22:41:21 +00:00
|
|
|
STATISTIC(NumSpills, "Number of register spills");
|
2007-03-20 08:13:50 +00:00
|
|
|
STATISTIC(NumReMats, "Number of re-materialization");
|
2007-08-14 23:25:37 +00:00
|
|
|
STATISTIC(NumDRM , "Number of re-materializable defs elided");
|
2006-12-19 22:41:21 +00:00
|
|
|
STATISTIC(NumStores, "Number of stores added");
|
|
|
|
STATISTIC(NumLoads , "Number of loads added");
|
|
|
|
STATISTIC(NumReused, "Number of values reused");
|
|
|
|
STATISTIC(NumDSE , "Number of dead stores elided");
|
|
|
|
STATISTIC(NumDCE , "Number of copies elided");
|
2004-09-30 01:54:45 +00:00
|
|
|
|
2006-12-19 22:41:21 +00:00
|
|
|
namespace {
|
2004-09-30 01:54:45 +00:00
|
|
|
enum SpillerName { simple, local };
|
|
|
|
|
2006-07-20 17:28:38 +00:00
|
|
|
static cl::opt<SpillerName>
|
2004-09-30 01:54:45 +00:00
|
|
|
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
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
2006-09-05 02:12:02 +00:00
|
|
|
VirtRegMap::VirtRegMap(MachineFunction &mf)
|
|
|
|
: TII(*mf.getTarget().getInstrInfo()), MF(mf),
|
2007-03-20 08:13:50 +00:00
|
|
|
Virt2PhysMap(NO_PHYS_REG), Virt2StackSlotMap(NO_STACK_SLOT),
|
2007-08-13 23:45:17 +00:00
|
|
|
Virt2ReMatIdMap(NO_STACK_SLOT), ReMatMap(NULL),
|
2007-03-20 08:13:50 +00:00
|
|
|
ReMatId(MAX_STACK_SLOT+1) {
|
2006-09-05 02:12:02 +00:00
|
|
|
grow();
|
|
|
|
}
|
|
|
|
|
2004-09-30 01:54:45 +00:00
|
|
|
void VirtRegMap::grow() {
|
2007-08-13 23:45:17 +00:00
|
|
|
unsigned LastVirtReg = MF.getSSARegMap()->getLastVirtReg();
|
|
|
|
Virt2PhysMap.grow(LastVirtReg);
|
|
|
|
Virt2StackSlotMap.grow(LastVirtReg);
|
|
|
|
Virt2ReMatIdMap.grow(LastVirtReg);
|
|
|
|
ReMatMap.grow(LastVirtReg);
|
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");
|
2007-04-04 07:40:01 +00:00
|
|
|
assert((frameIndex >= 0 ||
|
|
|
|
(frameIndex >= MF.getFrameInfo()->getObjectIndexBegin())) &&
|
|
|
|
"illegal fixed frame index");
|
2004-09-30 02:15:18 +00:00
|
|
|
Virt2StackSlotMap[virtReg] = frameIndex;
|
2004-05-29 20:38:05 +00:00
|
|
|
}
|
|
|
|
|
2007-03-20 08:13:50 +00:00
|
|
|
int VirtRegMap::assignVirtReMatId(unsigned virtReg) {
|
|
|
|
assert(MRegisterInfo::isVirtualRegister(virtReg));
|
2007-08-13 23:45:17 +00:00
|
|
|
assert(Virt2ReMatIdMap[virtReg] == NO_STACK_SLOT &&
|
2007-03-20 08:13:50 +00:00
|
|
|
"attempt to assign re-mat id to already spilled register");
|
2007-08-13 23:45:17 +00:00
|
|
|
Virt2ReMatIdMap[virtReg] = ReMatId;
|
2007-03-20 08:13:50 +00:00
|
|
|
return ReMatId++;
|
|
|
|
}
|
|
|
|
|
2007-08-13 23:45:17 +00:00
|
|
|
void VirtRegMap::assignVirtReMatId(unsigned virtReg, int id) {
|
|
|
|
assert(MRegisterInfo::isVirtualRegister(virtReg));
|
|
|
|
assert(Virt2ReMatIdMap[virtReg] == NO_STACK_SLOT &&
|
|
|
|
"attempt to assign re-mat id to already spilled register");
|
|
|
|
Virt2ReMatIdMap[virtReg] = id;
|
|
|
|
}
|
|
|
|
|
2004-10-01 23:15:36 +00:00
|
|
|
void VirtRegMap::virtFolded(unsigned VirtReg, MachineInstr *OldMI,
|
2006-05-01 21:16:03 +00:00
|
|
|
unsigned OpNo, MachineInstr *NewMI) {
|
2004-10-01 23:15:36 +00:00
|
|
|
// Move previous memory references folded to new instruction.
|
|
|
|
MI2VirtMapTy::iterator IP = MI2VirtMap.lower_bound(NewMI);
|
2005-04-21 22:36:52 +00:00
|
|
|
for (MI2VirtMapTy::iterator I = MI2VirtMap.lower_bound(OldMI),
|
2004-10-01 23:15:36 +00:00
|
|
|
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;
|
2006-12-08 08:02:34 +00:00
|
|
|
const TargetInstrDescriptor *TID = OldMI->getInstrDescriptor();
|
|
|
|
if (TID->getOperandConstraint(OpNo, TOI::TIED_TO) != -1 ||
|
2006-12-08 18:45:48 +00:00
|
|
|
TID->findTiedToSrcOperand(OpNo) != -1) {
|
2006-09-05 02:12:02 +00:00
|
|
|
// Folded a two-address operand.
|
|
|
|
MRInfo = isModRef;
|
|
|
|
} else if (OldMI->getOperand(OpNo).isDef()) {
|
|
|
|
MRInfo = isMod;
|
2004-10-01 23:15:36 +00:00
|
|
|
} else {
|
2006-09-05 02:12:02 +00:00
|
|
|
MRInfo = isRef;
|
2004-10-01 23:15:36 +00:00
|
|
|
}
|
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";
|
2005-04-21 22:36:52 +00:00
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2006-11-17 02:09:07 +00:00
|
|
|
void VirtRegMap::dump() const {
|
2006-12-17 05:15:13 +00:00
|
|
|
print(DOUT);
|
2006-11-17 02:09:07 +00:00
|
|
|
}
|
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 {
|
2006-06-28 22:17:39 +00:00
|
|
|
struct VISIBILITY_HIDDEN SimpleSpiller : public Spiller {
|
2006-05-01 21:16:03 +00:00
|
|
|
bool runOnMachineFunction(MachineFunction& mf, VirtRegMap &VRM);
|
2004-09-30 01:54:45 +00:00
|
|
|
};
|
|
|
|
}
|
2004-02-24 08:58:30 +00:00
|
|
|
|
2006-05-01 21:16:03 +00:00
|
|
|
bool SimpleSpiller::runOnMachineFunction(MachineFunction &MF, VirtRegMap &VRM) {
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << "********** REWRITE MACHINE CODE **********\n";
|
|
|
|
DOUT << "********** Function: " << MF.getFunction()->getName() << '\n';
|
2005-01-23 22:45:13 +00:00
|
|
|
const TargetMachine &TM = MF.getTarget();
|
|
|
|
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) {
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << MBBI->getBasicBlock()->getName() << ":\n";
|
2004-09-30 02:59:33 +00:00
|
|
|
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);
|
2005-04-04 21:35:34 +00:00
|
|
|
if (MO.isRegister() && MO.getReg())
|
|
|
|
if (MRegisterInfo::isVirtualRegister(MO.getReg())) {
|
|
|
|
unsigned VirtReg = MO.getReg();
|
|
|
|
unsigned PhysReg = VRM.getPhys(VirtReg);
|
2007-08-13 23:45:17 +00:00
|
|
|
if (!VRM.isAssignedReg(VirtReg)) {
|
2005-04-04 21:35:34 +00:00
|
|
|
int StackSlot = VRM.getStackSlot(VirtReg);
|
2005-09-30 01:29:00 +00:00
|
|
|
const TargetRegisterClass* RC =
|
|
|
|
MF.getSSARegMap()->getRegClass(VirtReg);
|
2005-04-21 22:36:52 +00:00
|
|
|
|
2005-04-04 21:35:34 +00:00
|
|
|
if (MO.isUse() &&
|
|
|
|
std::find(LoadedRegs.begin(), LoadedRegs.end(), VirtReg)
|
|
|
|
== LoadedRegs.end()) {
|
2005-09-30 01:29:00 +00:00
|
|
|
MRI.loadRegFromStackSlot(MBB, &MI, PhysReg, StackSlot, RC);
|
2005-04-04 21:35:34 +00:00
|
|
|
LoadedRegs.push_back(VirtReg);
|
|
|
|
++NumLoads;
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << '\t' << *prior(MII);
|
2005-04-04 21:35:34 +00:00
|
|
|
}
|
2005-04-21 22:36:52 +00:00
|
|
|
|
2005-04-04 21:35:34 +00:00
|
|
|
if (MO.isDef()) {
|
2005-09-30 01:29:00 +00:00
|
|
|
MRI.storeRegToStackSlot(MBB, next(MII), PhysReg, StackSlot, RC);
|
2005-04-04 21:35:34 +00:00
|
|
|
++NumStores;
|
|
|
|
}
|
2004-09-30 02:59:33 +00:00
|
|
|
}
|
2007-04-25 22:13:27 +00:00
|
|
|
MF.setPhysRegUsed(PhysReg);
|
2006-05-04 17:52:23 +00:00
|
|
|
MI.getOperand(i).setReg(PhysReg);
|
2005-04-04 21:35:34 +00:00
|
|
|
} else {
|
2007-04-25 22:13:27 +00:00
|
|
|
MF.setPhysRegUsed(MO.getReg());
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
|
|
|
}
|
2005-04-04 21:35:34 +00:00
|
|
|
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << '\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).
|
2006-06-28 22:17:39 +00:00
|
|
|
class VISIBILITY_HIDDEN LocalSpiller : public Spiller {
|
2004-09-30 01:54:45 +00:00
|
|
|
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:
|
2006-05-01 21:16:03 +00:00
|
|
|
bool runOnMachineFunction(MachineFunction &MF, VirtRegMap &VRM) {
|
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
|
|
|
MRI = MF.getTarget().getRegisterInfo();
|
|
|
|
TII = MF.getTarget().getInstrInfo();
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << "\n**** Local spiller rewriting function '"
|
|
|
|
<< MF.getFunction()->getName() << "':\n";
|
2007-09-06 16:36:39 +00:00
|
|
|
DOUT << "**** Machine Instrs (NOTE! Does not include spills and reloads!) ****\n";
|
|
|
|
DEBUG(MF.dump());
|
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 (MachineFunction::iterator MBB = MF.begin(), E = MF.end();
|
|
|
|
MBB != E; ++MBB)
|
2007-08-13 23:45:17 +00:00
|
|
|
RewriteMBB(*MBB, VRM);
|
2007-09-06 16:36:39 +00:00
|
|
|
|
|
|
|
DOUT << "**** Post Machine Instrs ****\n";
|
|
|
|
DEBUG(MF.dump());
|
|
|
|
|
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
|
|
|
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:
|
2007-08-13 23:45:17 +00:00
|
|
|
void RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM);
|
2004-09-30 01:54:45 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2006-02-03 23:13:58 +00:00
|
|
|
/// AvailableSpills - As the local spiller is scanning and rewriting an MBB from
|
2007-08-13 23:45:17 +00:00
|
|
|
/// top down, keep track of which spills slots or remat are available in each
|
|
|
|
/// register.
|
2006-02-03 23:28:46 +00:00
|
|
|
///
|
|
|
|
/// Note that not all physregs are created equal here. In particular, some
|
|
|
|
/// physregs are reloads that we are allowed to clobber or ignore at any time.
|
|
|
|
/// Other physregs are values that the register allocated program is using that
|
|
|
|
/// we cannot CHANGE, but we can read if we like. We keep track of this on a
|
2007-08-13 23:45:17 +00:00
|
|
|
/// per-stack-slot / remat id basis as the low bit in the value of the
|
|
|
|
/// SpillSlotsAvailable entries. The predicate 'canClobberPhysReg()' checks
|
|
|
|
/// this bit and addAvailable sets it if.
|
2006-06-28 22:17:39 +00:00
|
|
|
namespace {
|
|
|
|
class VISIBILITY_HIDDEN AvailableSpills {
|
2006-02-03 23:13:58 +00:00
|
|
|
const MRegisterInfo *MRI;
|
|
|
|
const TargetInstrInfo *TII;
|
|
|
|
|
2007-08-13 23:45:17 +00:00
|
|
|
// SpillSlotsOrReMatsAvailable - This map keeps track of all of the spilled
|
|
|
|
// or remat'ed virtual register values that are still available, due to being
|
|
|
|
// loaded or stored to, but not invalidated yet.
|
|
|
|
std::map<int, unsigned> SpillSlotsOrReMatsAvailable;
|
2006-02-03 23:13:58 +00:00
|
|
|
|
2007-08-13 23:45:17 +00:00
|
|
|
// PhysRegsAvailable - This is the inverse of SpillSlotsOrReMatsAvailable,
|
|
|
|
// indicating which stack slot values are currently held by a physreg. This
|
|
|
|
// is used to invalidate entries in SpillSlotsOrReMatsAvailable when a
|
|
|
|
// physreg is modified.
|
2006-02-03 23:13:58 +00:00
|
|
|
std::multimap<unsigned, int> PhysRegsAvailable;
|
|
|
|
|
2006-12-14 07:54:05 +00:00
|
|
|
void disallowClobberPhysRegOnly(unsigned PhysReg);
|
|
|
|
|
2006-02-03 23:13:58 +00:00
|
|
|
void ClobberPhysRegOnly(unsigned PhysReg);
|
|
|
|
public:
|
|
|
|
AvailableSpills(const MRegisterInfo *mri, const TargetInstrInfo *tii)
|
|
|
|
: MRI(mri), TII(tii) {
|
|
|
|
}
|
|
|
|
|
2007-02-23 01:13:26 +00:00
|
|
|
const MRegisterInfo *getRegInfo() const { return MRI; }
|
|
|
|
|
2007-08-13 23:45:17 +00:00
|
|
|
/// getSpillSlotOrReMatPhysReg - If the specified stack slot or remat is
|
|
|
|
/// available in a physical register, return that PhysReg, otherwise
|
|
|
|
/// return 0.
|
|
|
|
unsigned getSpillSlotOrReMatPhysReg(int Slot) const {
|
|
|
|
std::map<int, unsigned>::const_iterator I =
|
|
|
|
SpillSlotsOrReMatsAvailable.find(Slot);
|
|
|
|
if (I != SpillSlotsOrReMatsAvailable.end()) {
|
2007-07-11 08:47:44 +00:00
|
|
|
return I->second >> 1; // Remove the CanClobber bit.
|
2007-02-23 01:13:26 +00:00
|
|
|
}
|
2006-02-03 23:13:58 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2007-02-25 09:51:27 +00:00
|
|
|
|
2007-08-13 23:45:17 +00:00
|
|
|
/// addAvailable - Mark that the specified stack slot / remat is available in
|
|
|
|
/// the specified physreg. If CanClobber is true, the physreg can be modified
|
|
|
|
/// at any time without changing the semantics of the program.
|
|
|
|
void addAvailable(int SlotOrReMat, MachineInstr *MI, unsigned Reg,
|
2007-02-23 01:13:26 +00:00
|
|
|
bool CanClobber = true) {
|
2006-02-03 23:50:46 +00:00
|
|
|
// If this stack slot is thought to be available in some other physreg,
|
|
|
|
// remove its record.
|
2007-08-13 23:45:17 +00:00
|
|
|
ModifyStackSlotOrReMat(SlotOrReMat);
|
2006-02-03 23:50:46 +00:00
|
|
|
|
2007-08-13 23:45:17 +00:00
|
|
|
PhysRegsAvailable.insert(std::make_pair(Reg, SlotOrReMat));
|
2007-08-15 20:20:34 +00:00
|
|
|
SpillSlotsOrReMatsAvailable[SlotOrReMat]= (Reg << 1) | (unsigned)CanClobber;
|
2006-02-03 23:13:58 +00:00
|
|
|
|
2007-08-13 23:45:17 +00:00
|
|
|
if (SlotOrReMat > VirtRegMap::MAX_STACK_SLOT)
|
|
|
|
DOUT << "Remembering RM#" << SlotOrReMat-VirtRegMap::MAX_STACK_SLOT-1;
|
2007-03-20 08:13:50 +00:00
|
|
|
else
|
2007-08-13 23:45:17 +00:00
|
|
|
DOUT << "Remembering SS#" << SlotOrReMat;
|
2007-03-20 08:13:50 +00:00
|
|
|
DOUT << " in physreg " << MRI->getName(Reg) << "\n";
|
2006-02-03 23:13:58 +00:00
|
|
|
}
|
2006-12-14 07:54:05 +00:00
|
|
|
|
2006-02-03 23:28:46 +00:00
|
|
|
/// canClobberPhysReg - Return true if the spiller is allowed to change the
|
|
|
|
/// value of the specified stackslot register if it desires. The specified
|
|
|
|
/// stack slot must be available in a physreg for this query to make sense.
|
2007-08-13 23:45:17 +00:00
|
|
|
bool canClobberPhysReg(int SlotOrReMat) const {
|
2007-08-15 20:20:34 +00:00
|
|
|
assert(SpillSlotsOrReMatsAvailable.count(SlotOrReMat) &&
|
|
|
|
"Value not available!");
|
2007-08-13 23:45:17 +00:00
|
|
|
return SpillSlotsOrReMatsAvailable.find(SlotOrReMat)->second & 1;
|
2006-02-03 23:28:46 +00:00
|
|
|
}
|
2006-02-03 23:13:58 +00:00
|
|
|
|
2006-12-14 07:54:05 +00:00
|
|
|
/// disallowClobberPhysReg - Unset the CanClobber bit of the specified
|
|
|
|
/// stackslot register. The register is still available but is no longer
|
|
|
|
/// allowed to be modifed.
|
|
|
|
void disallowClobberPhysReg(unsigned PhysReg);
|
|
|
|
|
2006-02-03 23:13:58 +00:00
|
|
|
/// ClobberPhysReg - This is called when the specified physreg changes
|
|
|
|
/// value. We use this to invalidate any info about stuff we thing lives in
|
|
|
|
/// it and any of its aliases.
|
|
|
|
void ClobberPhysReg(unsigned PhysReg);
|
|
|
|
|
2007-08-15 20:20:34 +00:00
|
|
|
/// ModifyStackSlotOrReMat - This method is called when the value in a stack
|
|
|
|
/// slot changes. This removes information about which register the previous
|
|
|
|
/// value for this slot lives in (as the previous value is dead now).
|
2007-08-13 23:45:17 +00:00
|
|
|
void ModifyStackSlotOrReMat(int SlotOrReMat);
|
2006-02-03 23:13:58 +00:00
|
|
|
};
|
2006-06-28 22:17:39 +00:00
|
|
|
}
|
2006-02-03 23:13:58 +00:00
|
|
|
|
2006-12-14 07:54:05 +00:00
|
|
|
/// disallowClobberPhysRegOnly - Unset the CanClobber bit of the specified
|
|
|
|
/// stackslot register. The register is still available but is no longer
|
|
|
|
/// allowed to be modifed.
|
|
|
|
void AvailableSpills::disallowClobberPhysRegOnly(unsigned PhysReg) {
|
|
|
|
std::multimap<unsigned, int>::iterator I =
|
|
|
|
PhysRegsAvailable.lower_bound(PhysReg);
|
|
|
|
while (I != PhysRegsAvailable.end() && I->first == PhysReg) {
|
2007-08-13 23:45:17 +00:00
|
|
|
int SlotOrReMat = I->second;
|
2006-12-14 07:54:05 +00:00
|
|
|
I++;
|
2007-08-13 23:45:17 +00:00
|
|
|
assert((SpillSlotsOrReMatsAvailable[SlotOrReMat] >> 1) == PhysReg &&
|
2006-12-14 07:54:05 +00:00
|
|
|
"Bidirectional map mismatch!");
|
2007-08-13 23:45:17 +00:00
|
|
|
SpillSlotsOrReMatsAvailable[SlotOrReMat] &= ~1;
|
2006-12-14 07:54:05 +00:00
|
|
|
DOUT << "PhysReg " << MRI->getName(PhysReg)
|
|
|
|
<< " copied, it is available for use but can no longer be modified\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// disallowClobberPhysReg - Unset the CanClobber bit of the specified
|
|
|
|
/// stackslot register and its aliases. The register and its aliases may
|
|
|
|
/// still available but is no longer allowed to be modifed.
|
|
|
|
void AvailableSpills::disallowClobberPhysReg(unsigned PhysReg) {
|
|
|
|
for (const unsigned *AS = MRI->getAliasSet(PhysReg); *AS; ++AS)
|
|
|
|
disallowClobberPhysRegOnly(*AS);
|
|
|
|
disallowClobberPhysRegOnly(PhysReg);
|
|
|
|
}
|
|
|
|
|
2006-02-03 23:13:58 +00:00
|
|
|
/// ClobberPhysRegOnly - This is called when the specified physreg changes
|
|
|
|
/// value. We use this to invalidate any info about stuff we thing lives in it.
|
|
|
|
void AvailableSpills::ClobberPhysRegOnly(unsigned PhysReg) {
|
|
|
|
std::multimap<unsigned, int>::iterator I =
|
|
|
|
PhysRegsAvailable.lower_bound(PhysReg);
|
Physregs may hold multiple stack slot values at the same time. Keep track
of this, and use it to our advantage (bwahahah). This allows us to eliminate another
60 instructions from smg2000 on PPC (probably significantly more on X86). A common
old-new diff looks like this:
stw r2, 3304(r1)
- lwz r2, 3192(r1)
stw r2, 3300(r1)
- lwz r2, 3192(r1)
stw r2, 3296(r1)
- lwz r2, 3192(r1)
stw r2, 3200(r1)
- lwz r2, 3192(r1)
stw r2, 3196(r1)
- lwz r2, 3192(r1)
+ or r2, r2, r2
stw r2, 3188(r1)
and
- lwz r31, 604(r1)
- lwz r13, 604(r1)
- lwz r14, 604(r1)
- lwz r15, 604(r1)
- lwz r16, 604(r1)
- lwz r30, 604(r1)
+ or r31, r30, r30
+ or r13, r30, r30
+ or r14, r30, r30
+ or r15, r30, r30
+ or r16, r30, r30
+ or r30, r30, r30
Removal of the R = R copies is coming next...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25919 91177308-0d34-0410-b5e6-96231b3b80d8
2006-02-03 00:36:31 +00:00
|
|
|
while (I != PhysRegsAvailable.end() && I->first == PhysReg) {
|
2007-08-13 23:45:17 +00:00
|
|
|
int SlotOrReMat = I->second;
|
Physregs may hold multiple stack slot values at the same time. Keep track
of this, and use it to our advantage (bwahahah). This allows us to eliminate another
60 instructions from smg2000 on PPC (probably significantly more on X86). A common
old-new diff looks like this:
stw r2, 3304(r1)
- lwz r2, 3192(r1)
stw r2, 3300(r1)
- lwz r2, 3192(r1)
stw r2, 3296(r1)
- lwz r2, 3192(r1)
stw r2, 3200(r1)
- lwz r2, 3192(r1)
stw r2, 3196(r1)
- lwz r2, 3192(r1)
+ or r2, r2, r2
stw r2, 3188(r1)
and
- lwz r31, 604(r1)
- lwz r13, 604(r1)
- lwz r14, 604(r1)
- lwz r15, 604(r1)
- lwz r16, 604(r1)
- lwz r30, 604(r1)
+ or r31, r30, r30
+ or r13, r30, r30
+ or r14, r30, r30
+ or r15, r30, r30
+ or r16, r30, r30
+ or r30, r30, r30
Removal of the R = R copies is coming next...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25919 91177308-0d34-0410-b5e6-96231b3b80d8
2006-02-03 00:36:31 +00:00
|
|
|
PhysRegsAvailable.erase(I++);
|
2007-08-13 23:45:17 +00:00
|
|
|
assert((SpillSlotsOrReMatsAvailable[SlotOrReMat] >> 1) == PhysReg &&
|
2006-02-03 23:13:58 +00:00
|
|
|
"Bidirectional map mismatch!");
|
2007-08-13 23:45:17 +00:00
|
|
|
SpillSlotsOrReMatsAvailable.erase(SlotOrReMat);
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << "PhysReg " << MRI->getName(PhysReg)
|
2007-03-20 08:13:50 +00:00
|
|
|
<< " clobbered, invalidating ";
|
2007-08-13 23:45:17 +00:00
|
|
|
if (SlotOrReMat > VirtRegMap::MAX_STACK_SLOT)
|
|
|
|
DOUT << "RM#" << SlotOrReMat-VirtRegMap::MAX_STACK_SLOT-1 << "\n";
|
2007-03-20 08:13:50 +00:00
|
|
|
else
|
2007-08-13 23:45:17 +00:00
|
|
|
DOUT << "SS#" << SlotOrReMat << "\n";
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
|
|
|
}
|
2004-02-24 08:58:30 +00:00
|
|
|
|
2006-02-03 23:13:58 +00:00
|
|
|
/// ClobberPhysReg - This is called when the specified physreg changes
|
|
|
|
/// value. We use this to invalidate any info about stuff we thing lives in
|
|
|
|
/// it and any of its aliases.
|
|
|
|
void AvailableSpills::ClobberPhysReg(unsigned PhysReg) {
|
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 (const unsigned *AS = MRI->getAliasSet(PhysReg); *AS; ++AS)
|
2006-02-03 23:13:58 +00:00
|
|
|
ClobberPhysRegOnly(*AS);
|
|
|
|
ClobberPhysRegOnly(PhysReg);
|
Physregs may hold multiple stack slot values at the same time. Keep track
of this, and use it to our advantage (bwahahah). This allows us to eliminate another
60 instructions from smg2000 on PPC (probably significantly more on X86). A common
old-new diff looks like this:
stw r2, 3304(r1)
- lwz r2, 3192(r1)
stw r2, 3300(r1)
- lwz r2, 3192(r1)
stw r2, 3296(r1)
- lwz r2, 3192(r1)
stw r2, 3200(r1)
- lwz r2, 3192(r1)
stw r2, 3196(r1)
- lwz r2, 3192(r1)
+ or r2, r2, r2
stw r2, 3188(r1)
and
- lwz r31, 604(r1)
- lwz r13, 604(r1)
- lwz r14, 604(r1)
- lwz r15, 604(r1)
- lwz r16, 604(r1)
- lwz r30, 604(r1)
+ or r31, r30, r30
+ or r13, r30, r30
+ or r14, r30, r30
+ or r15, r30, r30
+ or r16, r30, r30
+ or r30, r30, r30
Removal of the R = R copies is coming next...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25919 91177308-0d34-0410-b5e6-96231b3b80d8
2006-02-03 00:36:31 +00:00
|
|
|
}
|
|
|
|
|
2007-08-15 20:20:34 +00:00
|
|
|
/// ModifyStackSlotOrReMat - This method is called when the value in a stack
|
|
|
|
/// slot changes. This removes information about which register the previous
|
|
|
|
/// value for this slot lives in (as the previous value is dead now).
|
2007-08-13 23:45:17 +00:00
|
|
|
void AvailableSpills::ModifyStackSlotOrReMat(int SlotOrReMat) {
|
2007-08-15 20:20:34 +00:00
|
|
|
std::map<int, unsigned>::iterator It =
|
|
|
|
SpillSlotsOrReMatsAvailable.find(SlotOrReMat);
|
2007-08-13 23:45:17 +00:00
|
|
|
if (It == SpillSlotsOrReMatsAvailable.end()) return;
|
2007-07-11 08:47:44 +00:00
|
|
|
unsigned Reg = It->second >> 1;
|
2007-08-13 23:45:17 +00:00
|
|
|
SpillSlotsOrReMatsAvailable.erase(It);
|
Physregs may hold multiple stack slot values at the same time. Keep track
of this, and use it to our advantage (bwahahah). This allows us to eliminate another
60 instructions from smg2000 on PPC (probably significantly more on X86). A common
old-new diff looks like this:
stw r2, 3304(r1)
- lwz r2, 3192(r1)
stw r2, 3300(r1)
- lwz r2, 3192(r1)
stw r2, 3296(r1)
- lwz r2, 3192(r1)
stw r2, 3200(r1)
- lwz r2, 3192(r1)
stw r2, 3196(r1)
- lwz r2, 3192(r1)
+ or r2, r2, r2
stw r2, 3188(r1)
and
- lwz r31, 604(r1)
- lwz r13, 604(r1)
- lwz r14, 604(r1)
- lwz r15, 604(r1)
- lwz r16, 604(r1)
- lwz r30, 604(r1)
+ or r31, r30, r30
+ or r13, r30, r30
+ or r14, r30, r30
+ or r15, r30, r30
+ or r16, r30, r30
+ or r30, r30, r30
Removal of the R = R copies is coming next...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25919 91177308-0d34-0410-b5e6-96231b3b80d8
2006-02-03 00:36:31 +00:00
|
|
|
|
|
|
|
// This register may hold the value of multiple stack slots, only remove this
|
|
|
|
// stack slot from the set of values the register contains.
|
|
|
|
std::multimap<unsigned, int>::iterator I = PhysRegsAvailable.lower_bound(Reg);
|
|
|
|
for (; ; ++I) {
|
|
|
|
assert(I != PhysRegsAvailable.end() && I->first == Reg &&
|
|
|
|
"Map inverse broken!");
|
2007-08-13 23:45:17 +00:00
|
|
|
if (I->second == SlotOrReMat) break;
|
Physregs may hold multiple stack slot values at the same time. Keep track
of this, and use it to our advantage (bwahahah). This allows us to eliminate another
60 instructions from smg2000 on PPC (probably significantly more on X86). A common
old-new diff looks like this:
stw r2, 3304(r1)
- lwz r2, 3192(r1)
stw r2, 3300(r1)
- lwz r2, 3192(r1)
stw r2, 3296(r1)
- lwz r2, 3192(r1)
stw r2, 3200(r1)
- lwz r2, 3192(r1)
stw r2, 3196(r1)
- lwz r2, 3192(r1)
+ or r2, r2, r2
stw r2, 3188(r1)
and
- lwz r31, 604(r1)
- lwz r13, 604(r1)
- lwz r14, 604(r1)
- lwz r15, 604(r1)
- lwz r16, 604(r1)
- lwz r30, 604(r1)
+ or r31, r30, r30
+ or r13, r30, r30
+ or r14, r30, r30
+ or r15, r30, r30
+ or r16, r30, r30
+ or r30, r30, r30
Removal of the R = R copies is coming next...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25919 91177308-0d34-0410-b5e6-96231b3b80d8
2006-02-03 00:36:31 +00:00
|
|
|
}
|
|
|
|
PhysRegsAvailable.erase(I);
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
Physregs may hold multiple stack slot values at the same time. Keep track
of this, and use it to our advantage (bwahahah). This allows us to eliminate another
60 instructions from smg2000 on PPC (probably significantly more on X86). A common
old-new diff looks like this:
stw r2, 3304(r1)
- lwz r2, 3192(r1)
stw r2, 3300(r1)
- lwz r2, 3192(r1)
stw r2, 3296(r1)
- lwz r2, 3192(r1)
stw r2, 3200(r1)
- lwz r2, 3192(r1)
stw r2, 3196(r1)
- lwz r2, 3192(r1)
+ or r2, r2, r2
stw r2, 3188(r1)
and
- lwz r31, 604(r1)
- lwz r13, 604(r1)
- lwz r14, 604(r1)
- lwz r15, 604(r1)
- lwz r16, 604(r1)
- lwz r30, 604(r1)
+ or r31, r30, r30
+ or r13, r30, r30
+ or r14, r30, r30
+ or r15, r30, r30
+ or r16, r30, r30
+ or r30, r30, r30
Removal of the R = R copies is coming next...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25919 91177308-0d34-0410-b5e6-96231b3b80d8
2006-02-03 00:36:31 +00:00
|
|
|
|
2007-07-11 19:17:18 +00:00
|
|
|
/// InvalidateKills - MI is going to be deleted. If any of its operands are
|
|
|
|
/// marked kill, then invalidate the information.
|
|
|
|
static void InvalidateKills(MachineInstr &MI, BitVector &RegKills,
|
2007-08-14 20:23:13 +00:00
|
|
|
std::vector<MachineOperand*> &KillOps,
|
2007-08-14 23:25:37 +00:00
|
|
|
SmallVector<unsigned, 1> *KillRegs = NULL) {
|
2007-07-11 19:17:18 +00:00
|
|
|
for (unsigned i = 0, e = MI.getNumOperands(); i != e; ++i) {
|
|
|
|
MachineOperand &MO = MI.getOperand(i);
|
2007-09-14 20:33:02 +00:00
|
|
|
if (!MO.isRegister() || !MO.isUse() || !MO.isKill())
|
2007-07-11 19:17:18 +00:00
|
|
|
continue;
|
|
|
|
unsigned Reg = MO.getReg();
|
2007-08-14 23:25:37 +00:00
|
|
|
if (KillRegs)
|
|
|
|
KillRegs->push_back(Reg);
|
2007-07-11 19:17:18 +00:00
|
|
|
if (KillOps[Reg] == &MO) {
|
|
|
|
RegKills.reset(Reg);
|
|
|
|
KillOps[Reg] = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-08-14 23:25:37 +00:00
|
|
|
/// InvalidateRegDef - If the def operand of the specified def MI is now dead
|
|
|
|
/// (since it's spill instruction is removed), mark it isDead. Also checks if
|
|
|
|
/// the def MI has other definition operands that are not dead. Returns it by
|
|
|
|
/// reference.
|
|
|
|
static bool InvalidateRegDef(MachineBasicBlock::iterator I,
|
|
|
|
MachineInstr &NewDef, unsigned Reg,
|
|
|
|
bool &HasLiveDef) {
|
|
|
|
// Due to remat, it's possible this reg isn't being reused. That is,
|
|
|
|
// the def of this reg (by prev MI) is now dead.
|
|
|
|
MachineInstr *DefMI = I;
|
|
|
|
MachineOperand *DefOp = NULL;
|
|
|
|
for (unsigned i = 0, e = DefMI->getNumOperands(); i != e; ++i) {
|
|
|
|
MachineOperand &MO = DefMI->getOperand(i);
|
2007-09-14 20:33:02 +00:00
|
|
|
if (MO.isRegister() && MO.isDef()) {
|
2007-08-14 23:25:37 +00:00
|
|
|
if (MO.getReg() == Reg)
|
|
|
|
DefOp = &MO;
|
|
|
|
else if (!MO.isDead())
|
|
|
|
HasLiveDef = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!DefOp)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
bool FoundUse = false, Done = false;
|
|
|
|
MachineBasicBlock::iterator E = NewDef;
|
|
|
|
++I; ++E;
|
|
|
|
for (; !Done && I != E; ++I) {
|
|
|
|
MachineInstr *NMI = I;
|
|
|
|
for (unsigned j = 0, ee = NMI->getNumOperands(); j != ee; ++j) {
|
|
|
|
MachineOperand &MO = NMI->getOperand(j);
|
2007-09-14 20:33:02 +00:00
|
|
|
if (!MO.isRegister() || MO.getReg() != Reg)
|
2007-08-14 23:25:37 +00:00
|
|
|
continue;
|
|
|
|
if (MO.isUse())
|
|
|
|
FoundUse = true;
|
|
|
|
Done = true; // Stop after scanning all the operands of this MI.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!FoundUse) {
|
|
|
|
// Def is dead!
|
|
|
|
DefOp->setIsDead();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2007-07-11 19:17:18 +00:00
|
|
|
/// UpdateKills - Track and update kill info. If a MI reads a register that is
|
|
|
|
/// marked kill, then it must be due to register reuse. Transfer the kill info
|
|
|
|
/// over.
|
|
|
|
static void UpdateKills(MachineInstr &MI, BitVector &RegKills,
|
|
|
|
std::vector<MachineOperand*> &KillOps) {
|
|
|
|
const TargetInstrDescriptor *TID = MI.getInstrDescriptor();
|
|
|
|
for (unsigned i = 0, e = MI.getNumOperands(); i != e; ++i) {
|
|
|
|
MachineOperand &MO = MI.getOperand(i);
|
2007-09-14 20:33:02 +00:00
|
|
|
if (!MO.isRegister() || !MO.isUse())
|
2007-07-11 19:17:18 +00:00
|
|
|
continue;
|
|
|
|
unsigned Reg = MO.getReg();
|
|
|
|
if (Reg == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (RegKills[Reg]) {
|
|
|
|
// That can't be right. Register is killed but not re-defined and it's
|
|
|
|
// being reused. Let's fix that.
|
|
|
|
KillOps[Reg]->unsetIsKill();
|
|
|
|
if (i < TID->numOperands &&
|
|
|
|
TID->getOperandConstraint(i, TOI::TIED_TO) == -1)
|
|
|
|
// Unless it's a two-address operand, this is the new kill.
|
|
|
|
MO.setIsKill();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (MO.isKill()) {
|
|
|
|
RegKills.set(Reg);
|
|
|
|
KillOps[Reg] = &MO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (unsigned i = 0, e = MI.getNumOperands(); i != e; ++i) {
|
|
|
|
const MachineOperand &MO = MI.getOperand(i);
|
2007-09-14 20:33:02 +00:00
|
|
|
if (!MO.isRegister() || !MO.isDef())
|
2007-07-11 19:17:18 +00:00
|
|
|
continue;
|
|
|
|
unsigned Reg = MO.getReg();
|
|
|
|
RegKills.reset(Reg);
|
|
|
|
KillOps[Reg] = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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;
|
2005-04-21 22:36:52 +00:00
|
|
|
|
2007-08-13 23:45:17 +00:00
|
|
|
// StackSlotOrReMat - The spill slot or remat id of the value being reused.
|
|
|
|
unsigned StackSlotOrReMat;
|
2005-04-21 22:36:52 +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
|
|
|
// PhysRegReused - The physical register the value was available in.
|
|
|
|
unsigned PhysRegReused;
|
2005-04-21 22:36:52 +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
|
|
|
// AssignedPhysReg - The physreg that was assigned for use by the reload.
|
|
|
|
unsigned AssignedPhysReg;
|
2005-10-06 17:19:06 +00:00
|
|
|
|
|
|
|
// VirtReg - The virtual register itself.
|
|
|
|
unsigned VirtReg;
|
|
|
|
|
|
|
|
ReusedOp(unsigned o, unsigned ss, unsigned prr, unsigned apr,
|
|
|
|
unsigned vreg)
|
2007-08-15 20:20:34 +00:00
|
|
|
: Operand(o), StackSlotOrReMat(ss), PhysRegReused(prr),
|
|
|
|
AssignedPhysReg(apr), VirtReg(vreg) {}
|
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
|
|
|
};
|
2006-02-25 01:51:33 +00:00
|
|
|
|
|
|
|
/// ReuseInfo - This maintains a collection of ReuseOp's for each operand that
|
|
|
|
/// is reused instead of reloaded.
|
2006-06-28 22:17:39 +00:00
|
|
|
class VISIBILITY_HIDDEN ReuseInfo {
|
2006-02-25 01:51:33 +00:00
|
|
|
MachineInstr &MI;
|
|
|
|
std::vector<ReusedOp> Reuses;
|
2007-02-21 02:22:03 +00:00
|
|
|
BitVector PhysRegsClobbered;
|
2006-02-25 01:51:33 +00:00
|
|
|
public:
|
2006-11-04 00:21:55 +00:00
|
|
|
ReuseInfo(MachineInstr &mi, const MRegisterInfo *mri) : MI(mi) {
|
2007-02-21 02:22:03 +00:00
|
|
|
PhysRegsClobbered.resize(mri->getNumRegs());
|
2006-11-04 00:21:55 +00:00
|
|
|
}
|
2006-02-25 01:51:33 +00:00
|
|
|
|
|
|
|
bool hasReuses() const {
|
|
|
|
return !Reuses.empty();
|
|
|
|
}
|
|
|
|
|
|
|
|
/// addReuse - If we choose to reuse a virtual register that is already
|
|
|
|
/// available instead of reloading it, remember that we did so.
|
2007-08-13 23:45:17 +00:00
|
|
|
void addReuse(unsigned OpNo, unsigned StackSlotOrReMat,
|
2006-02-25 01:51:33 +00:00
|
|
|
unsigned PhysRegReused, unsigned AssignedPhysReg,
|
|
|
|
unsigned VirtReg) {
|
|
|
|
// If the reload is to the assigned register anyway, no undo will be
|
|
|
|
// required.
|
|
|
|
if (PhysRegReused == AssignedPhysReg) return;
|
|
|
|
|
|
|
|
// Otherwise, remember this.
|
2007-08-13 23:45:17 +00:00
|
|
|
Reuses.push_back(ReusedOp(OpNo, StackSlotOrReMat, PhysRegReused,
|
2006-02-25 01:51:33 +00:00
|
|
|
AssignedPhysReg, VirtReg));
|
|
|
|
}
|
2006-11-04 00:21:55 +00:00
|
|
|
|
|
|
|
void markClobbered(unsigned PhysReg) {
|
2007-02-21 02:22:03 +00:00
|
|
|
PhysRegsClobbered.set(PhysReg);
|
2006-11-04 00:21:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool isClobbered(unsigned PhysReg) const {
|
2007-02-21 02:22:03 +00:00
|
|
|
return PhysRegsClobbered.test(PhysReg);
|
2006-11-04 00:21:55 +00:00
|
|
|
}
|
2006-02-25 01:51:33 +00:00
|
|
|
|
|
|
|
/// GetRegForReload - We are about to emit a reload into PhysReg. If there
|
|
|
|
/// is some other operand that is using the specified register, either pick
|
|
|
|
/// a new register to use, or evict the previous reload and use this reg.
|
|
|
|
unsigned GetRegForReload(unsigned PhysReg, MachineInstr *MI,
|
|
|
|
AvailableSpills &Spills,
|
2007-08-14 09:11:18 +00:00
|
|
|
std::vector<MachineInstr*> &MaybeDeadStores,
|
2007-07-11 19:17:18 +00:00
|
|
|
SmallSet<unsigned, 8> &Rejected,
|
|
|
|
BitVector &RegKills,
|
2007-08-13 23:45:17 +00:00
|
|
|
std::vector<MachineOperand*> &KillOps,
|
|
|
|
VirtRegMap &VRM) {
|
2006-02-25 01:51:33 +00:00
|
|
|
if (Reuses.empty()) return PhysReg; // This is most often empty.
|
|
|
|
|
|
|
|
for (unsigned ro = 0, e = Reuses.size(); ro != e; ++ro) {
|
|
|
|
ReusedOp &Op = Reuses[ro];
|
|
|
|
// If we find some other reuse that was supposed to use this register
|
|
|
|
// exactly for its reload, we can change this reload to use ITS reload
|
2007-01-19 22:40:14 +00:00
|
|
|
// register. That is, unless its reload register has already been
|
|
|
|
// considered and subsequently rejected because it has also been reused
|
|
|
|
// by another operand.
|
|
|
|
if (Op.PhysRegReused == PhysReg &&
|
|
|
|
Rejected.count(Op.AssignedPhysReg) == 0) {
|
2006-02-25 01:51:33 +00:00
|
|
|
// Yup, use the reload register that we didn't use before.
|
2007-01-19 22:40:14 +00:00
|
|
|
unsigned NewReg = Op.AssignedPhysReg;
|
|
|
|
Rejected.insert(PhysReg);
|
2007-07-11 19:17:18 +00:00
|
|
|
return GetRegForReload(NewReg, MI, Spills, MaybeDeadStores, Rejected,
|
2007-08-13 23:45:17 +00:00
|
|
|
RegKills, KillOps, VRM);
|
2006-02-25 01:51:33 +00:00
|
|
|
} else {
|
|
|
|
// Otherwise, we might also have a problem if a previously reused
|
|
|
|
// value aliases the new register. If so, codegen the previous reload
|
|
|
|
// and use this one.
|
|
|
|
unsigned PRRU = Op.PhysRegReused;
|
|
|
|
const MRegisterInfo *MRI = Spills.getRegInfo();
|
|
|
|
if (MRI->areAliases(PRRU, 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.
|
|
|
|
MachineBasicBlock *MBB = MI->getParent();
|
|
|
|
const TargetRegisterClass *AliasRC =
|
2006-02-25 02:17:31 +00:00
|
|
|
MBB->getParent()->getSSARegMap()->getRegClass(Op.VirtReg);
|
|
|
|
|
|
|
|
// Copy Op out of the vector and remove it, we're going to insert an
|
|
|
|
// explicit load for it.
|
|
|
|
ReusedOp NewOp = Op;
|
|
|
|
Reuses.erase(Reuses.begin()+ro);
|
|
|
|
|
|
|
|
// Ok, we're going to try to reload the assigned physreg into the
|
|
|
|
// slot that we were supposed to in the first place. However, that
|
|
|
|
// register could hold a reuse. Check to see if it conflicts or
|
|
|
|
// would prefer us to use a different register.
|
|
|
|
unsigned NewPhysReg = GetRegForReload(NewOp.AssignedPhysReg,
|
2007-07-11 19:17:18 +00:00
|
|
|
MI, Spills, MaybeDeadStores,
|
2007-08-13 23:45:17 +00:00
|
|
|
Rejected, RegKills, KillOps, VRM);
|
2006-02-25 02:17:31 +00:00
|
|
|
|
2007-08-13 23:45:17 +00:00
|
|
|
if (NewOp.StackSlotOrReMat > VirtRegMap::MAX_STACK_SLOT) {
|
|
|
|
MRI->reMaterialize(*MBB, MI, NewPhysReg,
|
|
|
|
VRM.getReMaterializedMI(NewOp.VirtReg));
|
|
|
|
++NumReMats;
|
|
|
|
} else {
|
|
|
|
MRI->loadRegFromStackSlot(*MBB, MI, NewPhysReg,
|
|
|
|
NewOp.StackSlotOrReMat, AliasRC);
|
2007-08-14 09:11:18 +00:00
|
|
|
// Any stores to this stack slot are not dead anymore.
|
|
|
|
MaybeDeadStores[NewOp.StackSlotOrReMat] = NULL;
|
2007-08-13 23:45:17 +00:00
|
|
|
++NumLoads;
|
|
|
|
}
|
2006-02-25 02:17:31 +00:00
|
|
|
Spills.ClobberPhysReg(NewPhysReg);
|
|
|
|
Spills.ClobberPhysReg(NewOp.PhysRegReused);
|
2006-02-25 01:51:33 +00:00
|
|
|
|
2006-05-04 17:52:23 +00:00
|
|
|
MI->getOperand(NewOp.Operand).setReg(NewPhysReg);
|
2006-02-25 01:51:33 +00:00
|
|
|
|
2007-08-13 23:45:17 +00:00
|
|
|
Spills.addAvailable(NewOp.StackSlotOrReMat, MI, NewPhysReg);
|
2007-07-11 19:17:18 +00:00
|
|
|
MachineBasicBlock::iterator MII = MI;
|
|
|
|
--MII;
|
|
|
|
UpdateKills(*MII, RegKills, KillOps);
|
|
|
|
DOUT << '\t' << *MII;
|
2006-02-25 01:51:33 +00:00
|
|
|
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << "Reuse undone!\n";
|
2006-02-25 01:51:33 +00:00
|
|
|
--NumReused;
|
2006-02-25 02:17:31 +00:00
|
|
|
|
|
|
|
// Finally, PhysReg is now available, go ahead and use it.
|
2006-02-25 01:51:33 +00:00
|
|
|
return PhysReg;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return PhysReg;
|
|
|
|
}
|
2007-01-19 22:40:14 +00:00
|
|
|
|
|
|
|
/// GetRegForReload - Helper for the above GetRegForReload(). Add a
|
|
|
|
/// 'Rejected' set to remember which registers have been considered and
|
|
|
|
/// rejected for the reload. This avoids infinite looping in case like
|
|
|
|
/// this:
|
|
|
|
/// t1 := op t2, t3
|
|
|
|
/// t2 <- assigned r0 for use by the reload but ended up reuse r1
|
|
|
|
/// t3 <- assigned r1 for use by the reload but ended up reuse r0
|
|
|
|
/// t1 <- desires r1
|
|
|
|
/// sees r1 is taken by t2, tries t2's reload register r0
|
|
|
|
/// sees r0 is taken by t3, tries t3's reload register r1
|
|
|
|
/// sees r1 is taken by t2, tries t2's reload register r0 ...
|
|
|
|
unsigned GetRegForReload(unsigned PhysReg, MachineInstr *MI,
|
|
|
|
AvailableSpills &Spills,
|
2007-08-14 09:11:18 +00:00
|
|
|
std::vector<MachineInstr*> &MaybeDeadStores,
|
2007-07-11 19:17:18 +00:00
|
|
|
BitVector &RegKills,
|
2007-08-13 23:45:17 +00:00
|
|
|
std::vector<MachineOperand*> &KillOps,
|
|
|
|
VirtRegMap &VRM) {
|
2007-01-23 00:59:48 +00:00
|
|
|
SmallSet<unsigned, 8> Rejected;
|
2007-07-11 19:17:18 +00:00
|
|
|
return GetRegForReload(PhysReg, MI, Spills, MaybeDeadStores, Rejected,
|
2007-08-13 23:45:17 +00:00
|
|
|
RegKills, KillOps, VRM);
|
2007-01-19 22:40:14 +00:00
|
|
|
}
|
2006-02-25 01:51: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
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// rewriteMBB - Keep track of which spills are available even after the
|
|
|
|
/// register allocator is done with them. If possible, avoid reloading vregs.
|
2007-08-13 23:45:17 +00:00
|
|
|
void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM) {
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << MBB.getBasicBlock()->getName() << ":\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
|
|
|
|
2007-08-14 09:11:18 +00:00
|
|
|
MachineFunction &MF = *MBB.getParent();
|
|
|
|
|
2006-02-03 23:13:58 +00:00
|
|
|
// Spills - Keep track of which spilled values are available in physregs so
|
|
|
|
// that we can choose to reuse the physregs instead of emitting reloads.
|
|
|
|
AvailableSpills Spills(MRI, TII);
|
|
|
|
|
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.
|
2007-08-14 09:11:18 +00:00
|
|
|
std::vector<MachineInstr*> MaybeDeadStores;
|
|
|
|
MaybeDeadStores.resize(MF.getFrameInfo()->getObjectIndexEnd(), NULL);
|
2004-10-01 19:47:12 +00:00
|
|
|
|
2007-08-14 23:25:37 +00:00
|
|
|
// ReMatDefs - These are rematerializable def MIs which are not deleted.
|
|
|
|
SmallSet<MachineInstr*, 4> ReMatDefs;
|
|
|
|
|
2007-07-11 05:28:39 +00:00
|
|
|
// Keep track of kill information.
|
|
|
|
BitVector RegKills(MRI->getNumRegs());
|
|
|
|
std::vector<MachineOperand*> KillOps;
|
|
|
|
KillOps.resize(MRI->getNumRegs(), NULL);
|
|
|
|
|
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;
|
2007-07-11 05:28:39 +00:00
|
|
|
VirtRegMap::MI2VirtMapTy::const_iterator I, End;
|
|
|
|
|
|
|
|
bool Erased = false;
|
|
|
|
bool BackTracked = false;
|
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
|
|
|
|
2006-02-25 01:51:33 +00:00
|
|
|
/// ReusedOperands - Keep track of operand reuse in case we need to undo
|
|
|
|
/// reuse.
|
2006-11-04 00:21:55 +00:00
|
|
|
ReuseInfo ReusedOperands(MI, MRI);
|
|
|
|
|
|
|
|
// Loop over all of the implicit defs, clearing them from our available
|
|
|
|
// sets.
|
2006-12-15 06:41:01 +00:00
|
|
|
const TargetInstrDescriptor *TID = MI.getInstrDescriptor();
|
2007-07-11 05:28:39 +00:00
|
|
|
if (TID->ImplicitDefs) {
|
|
|
|
const unsigned *ImpDef = TID->ImplicitDefs;
|
2006-11-04 00:21:55 +00:00
|
|
|
for ( ; *ImpDef; ++ImpDef) {
|
2007-04-25 22:13:27 +00:00
|
|
|
MF.setPhysRegUsed(*ImpDef);
|
2006-11-04 00:21:55 +00:00
|
|
|
ReusedOperands.markClobbered(*ImpDef);
|
|
|
|
Spills.ClobberPhysReg(*ImpDef);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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 uses and all non spilled reg references.
|
|
|
|
for (unsigned i = 0, e = MI.getNumOperands(); i != e; ++i) {
|
|
|
|
MachineOperand &MO = MI.getOperand(i);
|
2005-09-09 20:29:51 +00:00
|
|
|
if (!MO.isRegister() || MO.getReg() == 0)
|
|
|
|
continue; // Ignore non-register operands.
|
|
|
|
|
|
|
|
if (MRegisterInfo::isPhysicalRegister(MO.getReg())) {
|
|
|
|
// Ignore physregs for spilling, but remember that it is used by this
|
|
|
|
// function.
|
2007-04-25 22:13:27 +00:00
|
|
|
MF.setPhysRegUsed(MO.getReg());
|
2006-11-04 00:21:55 +00:00
|
|
|
ReusedOperands.markClobbered(MO.getReg());
|
2005-09-09 20:29:51 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(MRegisterInfo::isVirtualRegister(MO.getReg()) &&
|
|
|
|
"Not a virtual or a physical register?");
|
|
|
|
|
|
|
|
unsigned VirtReg = MO.getReg();
|
2007-08-13 23:45:17 +00:00
|
|
|
if (VRM.isAssignedReg(VirtReg)) {
|
2005-09-09 20:29:51 +00:00
|
|
|
// This virtual register was assigned a physreg!
|
|
|
|
unsigned Phys = VRM.getPhys(VirtReg);
|
2007-04-25 22:13:27 +00:00
|
|
|
MF.setPhysRegUsed(Phys);
|
2006-11-04 00:21:55 +00:00
|
|
|
if (MO.isDef())
|
|
|
|
ReusedOperands.markClobbered(Phys);
|
2006-05-04 17:52:23 +00:00
|
|
|
MI.getOperand(i).setReg(Phys);
|
2005-09-09 20:29:51 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This virtual register is now known to be a spilled value.
|
|
|
|
if (!MO.isUse())
|
|
|
|
continue; // Handle defs in the loop below (handle use&def here though)
|
|
|
|
|
2007-08-13 23:45:17 +00:00
|
|
|
bool DoReMat = VRM.isReMaterialized(VirtReg);
|
|
|
|
int SSorRMId = DoReMat
|
|
|
|
? VRM.getReMatId(VirtReg) : VRM.getStackSlot(VirtReg);
|
2007-08-14 05:42:54 +00:00
|
|
|
int ReuseSlot = SSorRMId;
|
2005-09-09 20:29:51 +00:00
|
|
|
|
|
|
|
// Check to see if this stack slot is available.
|
2007-08-14 05:42:54 +00:00
|
|
|
unsigned PhysReg = Spills.getSpillSlotOrReMatPhysReg(SSorRMId);
|
|
|
|
if (!PhysReg && DoReMat) {
|
|
|
|
// This use is rematerializable. But perhaps the value is available in
|
|
|
|
// stack if the definition is not deleted. If so, check if we can
|
|
|
|
// reuse the value.
|
|
|
|
ReuseSlot = VRM.getStackSlot(VirtReg);
|
|
|
|
if (ReuseSlot != VirtRegMap::NO_STACK_SLOT)
|
|
|
|
PhysReg = Spills.getSpillSlotOrReMatPhysReg(ReuseSlot);
|
|
|
|
}
|
|
|
|
if (PhysReg) {
|
2006-09-05 02:12:02 +00:00
|
|
|
// This spilled operand might be part of a two-address operand. If this
|
|
|
|
// is the case, then changing it will necessarily require changing the
|
|
|
|
// def part of the instruction as well. However, in some cases, we
|
|
|
|
// aren't allowed to modify the reused register. If none of these cases
|
|
|
|
// apply, reuse it.
|
|
|
|
bool CanReuse = true;
|
2006-12-15 06:41:01 +00:00
|
|
|
int ti = TID->getOperandConstraint(i, TOI::TIED_TO);
|
2006-11-01 23:06:55 +00:00
|
|
|
if (ti != -1 &&
|
2007-09-14 20:33:02 +00:00
|
|
|
MI.getOperand(ti).isRegister() &&
|
2006-11-01 23:06:55 +00:00
|
|
|
MI.getOperand(ti).getReg() == VirtReg) {
|
2006-09-05 02:12:02 +00:00
|
|
|
// Okay, we have a two address operand. We can reuse this physreg as
|
2007-01-19 22:40:14 +00:00
|
|
|
// long as we are allowed to clobber the value and there isn't an
|
|
|
|
// earlier def that has already clobbered the physreg.
|
2007-08-14 05:42:54 +00:00
|
|
|
CanReuse = Spills.canClobberPhysReg(ReuseSlot) &&
|
2006-11-04 00:21:55 +00:00
|
|
|
!ReusedOperands.isClobbered(PhysReg);
|
2006-09-05 02:12:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (CanReuse) {
|
When we have a two-address instruction where the input cannot be clobbered
and is already available, instead of falling back to emitting a load, fall
back to emitting a reg-reg copy. This generates significantly better code
for some SSE testcases, as SSE has lots of two-address instructions and
none of them are read/modify/write. As one example, this change does:
pshufd %XMM5, XMMWORD PTR [%ESP + 84], 255
xorps %XMM2, %XMM5
cmpltps %XMM1, %XMM0
- movaps XMMWORD PTR [%ESP + 52], %XMM0
- movapd %XMM6, XMMWORD PTR [%ESP + 52]
+ movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 68]
movapd XMMWORD PTR [%ESP + 52], %XMM6
movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 36]
cmpltps %XMM3, %XMM0
- movaps XMMWORD PTR [%ESP + 20], %XMM0
- movapd %XMM7, XMMWORD PTR [%ESP + 20]
+ movaps %XMM7, %XMM0
cmpltps %XMM7, XMMWORD PTR [%ESP + 4]
movapd XMMWORD PTR [%ESP + 20], %XMM7
cmpltps %XMM4, %XMM0
... which is far better than a store followed by a load!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28001 91177308-0d34-0410-b5e6-96231b3b80d8
2006-04-28 01:46:50 +00:00
|
|
|
// If this stack slot value is already available, reuse it!
|
2007-08-14 05:42:54 +00:00
|
|
|
if (ReuseSlot > VirtRegMap::MAX_STACK_SLOT)
|
|
|
|
DOUT << "Reusing RM#" << ReuseSlot-VirtRegMap::MAX_STACK_SLOT-1;
|
2007-03-20 08:13:50 +00:00
|
|
|
else
|
2007-08-14 05:42:54 +00:00
|
|
|
DOUT << "Reusing SS#" << ReuseSlot;
|
2007-03-20 08:13:50 +00:00
|
|
|
DOUT << " from physreg "
|
2006-11-17 02:09:07 +00:00
|
|
|
<< MRI->getName(PhysReg) << " for vreg"
|
|
|
|
<< VirtReg <<" instead of reloading into physreg "
|
|
|
|
<< MRI->getName(VRM.getPhys(VirtReg)) << "\n";
|
2006-05-04 17:52:23 +00:00
|
|
|
MI.getOperand(i).setReg(PhysReg);
|
When we have a two-address instruction where the input cannot be clobbered
and is already available, instead of falling back to emitting a load, fall
back to emitting a reg-reg copy. This generates significantly better code
for some SSE testcases, as SSE has lots of two-address instructions and
none of them are read/modify/write. As one example, this change does:
pshufd %XMM5, XMMWORD PTR [%ESP + 84], 255
xorps %XMM2, %XMM5
cmpltps %XMM1, %XMM0
- movaps XMMWORD PTR [%ESP + 52], %XMM0
- movapd %XMM6, XMMWORD PTR [%ESP + 52]
+ movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 68]
movapd XMMWORD PTR [%ESP + 52], %XMM6
movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 36]
cmpltps %XMM3, %XMM0
- movaps XMMWORD PTR [%ESP + 20], %XMM0
- movapd %XMM7, XMMWORD PTR [%ESP + 20]
+ movaps %XMM7, %XMM0
cmpltps %XMM7, XMMWORD PTR [%ESP + 4]
movapd XMMWORD PTR [%ESP + 20], %XMM7
cmpltps %XMM4, %XMM0
... which is far better than a store followed by a load!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28001 91177308-0d34-0410-b5e6-96231b3b80d8
2006-04-28 01:46:50 +00:00
|
|
|
|
|
|
|
// 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.
|
2007-08-14 05:42:54 +00:00
|
|
|
ReusedOperands.addReuse(i, ReuseSlot, PhysReg,
|
When we have a two-address instruction where the input cannot be clobbered
and is already available, instead of falling back to emitting a load, fall
back to emitting a reg-reg copy. This generates significantly better code
for some SSE testcases, as SSE has lots of two-address instructions and
none of them are read/modify/write. As one example, this change does:
pshufd %XMM5, XMMWORD PTR [%ESP + 84], 255
xorps %XMM2, %XMM5
cmpltps %XMM1, %XMM0
- movaps XMMWORD PTR [%ESP + 52], %XMM0
- movapd %XMM6, XMMWORD PTR [%ESP + 52]
+ movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 68]
movapd XMMWORD PTR [%ESP + 52], %XMM6
movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 36]
cmpltps %XMM3, %XMM0
- movaps XMMWORD PTR [%ESP + 20], %XMM0
- movapd %XMM7, XMMWORD PTR [%ESP + 20]
+ movaps %XMM7, %XMM0
cmpltps %XMM7, XMMWORD PTR [%ESP + 4]
movapd XMMWORD PTR [%ESP + 20], %XMM7
cmpltps %XMM4, %XMM0
... which is far better than a store followed by a load!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28001 91177308-0d34-0410-b5e6-96231b3b80d8
2006-04-28 01:46:50 +00:00
|
|
|
VRM.getPhys(VirtReg), VirtReg);
|
2006-11-04 00:21:55 +00:00
|
|
|
if (ti != -1)
|
|
|
|
// Only mark it clobbered if this is a use&def operand.
|
|
|
|
ReusedOperands.markClobbered(PhysReg);
|
When we have a two-address instruction where the input cannot be clobbered
and is already available, instead of falling back to emitting a load, fall
back to emitting a reg-reg copy. This generates significantly better code
for some SSE testcases, as SSE has lots of two-address instructions and
none of them are read/modify/write. As one example, this change does:
pshufd %XMM5, XMMWORD PTR [%ESP + 84], 255
xorps %XMM2, %XMM5
cmpltps %XMM1, %XMM0
- movaps XMMWORD PTR [%ESP + 52], %XMM0
- movapd %XMM6, XMMWORD PTR [%ESP + 52]
+ movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 68]
movapd XMMWORD PTR [%ESP + 52], %XMM6
movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 36]
cmpltps %XMM3, %XMM0
- movaps XMMWORD PTR [%ESP + 20], %XMM0
- movapd %XMM7, XMMWORD PTR [%ESP + 20]
+ movaps %XMM7, %XMM0
cmpltps %XMM7, XMMWORD PTR [%ESP + 4]
movapd XMMWORD PTR [%ESP + 20], %XMM7
cmpltps %XMM4, %XMM0
... which is far better than a store followed by a load!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28001 91177308-0d34-0410-b5e6-96231b3b80d8
2006-04-28 01:46:50 +00:00
|
|
|
++NumReused;
|
2007-08-14 09:11:18 +00:00
|
|
|
|
|
|
|
if (MI.getOperand(i).isKill() &&
|
|
|
|
ReuseSlot <= VirtRegMap::MAX_STACK_SLOT) {
|
|
|
|
// This was the last use and the spilled value is still available
|
|
|
|
// for reuse. That means the spill was unnecessary!
|
|
|
|
MachineInstr* DeadStore = MaybeDeadStores[ReuseSlot];
|
|
|
|
if (DeadStore) {
|
|
|
|
DOUT << "Removed dead store:\t" << *DeadStore;
|
|
|
|
InvalidateKills(*DeadStore, RegKills, KillOps);
|
|
|
|
MBB.erase(DeadStore);
|
|
|
|
VRM.RemoveFromFoldedVirtMap(DeadStore);
|
|
|
|
MaybeDeadStores[ReuseSlot] = NULL;
|
|
|
|
++NumDSE;
|
|
|
|
}
|
|
|
|
}
|
When we have a two-address instruction where the input cannot be clobbered
and is already available, instead of falling back to emitting a load, fall
back to emitting a reg-reg copy. This generates significantly better code
for some SSE testcases, as SSE has lots of two-address instructions and
none of them are read/modify/write. As one example, this change does:
pshufd %XMM5, XMMWORD PTR [%ESP + 84], 255
xorps %XMM2, %XMM5
cmpltps %XMM1, %XMM0
- movaps XMMWORD PTR [%ESP + 52], %XMM0
- movapd %XMM6, XMMWORD PTR [%ESP + 52]
+ movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 68]
movapd XMMWORD PTR [%ESP + 52], %XMM6
movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 36]
cmpltps %XMM3, %XMM0
- movaps XMMWORD PTR [%ESP + 20], %XMM0
- movapd %XMM7, XMMWORD PTR [%ESP + 20]
+ movaps %XMM7, %XMM0
cmpltps %XMM7, XMMWORD PTR [%ESP + 4]
movapd XMMWORD PTR [%ESP + 20], %XMM7
cmpltps %XMM4, %XMM0
... which is far better than a store followed by a load!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28001 91177308-0d34-0410-b5e6-96231b3b80d8
2006-04-28 01:46:50 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Otherwise we have a situation where we have a two-address instruction
|
|
|
|
// whose mod/ref operand needs to be reloaded. This reload is already
|
|
|
|
// available in some register "PhysReg", but if we used PhysReg as the
|
|
|
|
// operand to our 2-addr instruction, the instruction would modify
|
|
|
|
// PhysReg. This isn't cool if something later uses PhysReg and expects
|
|
|
|
// to get its initial value.
|
2005-09-09 20:29:51 +00:00
|
|
|
//
|
When we have a two-address instruction where the input cannot be clobbered
and is already available, instead of falling back to emitting a load, fall
back to emitting a reg-reg copy. This generates significantly better code
for some SSE testcases, as SSE has lots of two-address instructions and
none of them are read/modify/write. As one example, this change does:
pshufd %XMM5, XMMWORD PTR [%ESP + 84], 255
xorps %XMM2, %XMM5
cmpltps %XMM1, %XMM0
- movaps XMMWORD PTR [%ESP + 52], %XMM0
- movapd %XMM6, XMMWORD PTR [%ESP + 52]
+ movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 68]
movapd XMMWORD PTR [%ESP + 52], %XMM6
movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 36]
cmpltps %XMM3, %XMM0
- movaps XMMWORD PTR [%ESP + 20], %XMM0
- movapd %XMM7, XMMWORD PTR [%ESP + 20]
+ movaps %XMM7, %XMM0
cmpltps %XMM7, XMMWORD PTR [%ESP + 4]
movapd XMMWORD PTR [%ESP + 20], %XMM7
cmpltps %XMM4, %XMM0
... which is far better than a store followed by a load!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28001 91177308-0d34-0410-b5e6-96231b3b80d8
2006-04-28 01:46:50 +00:00
|
|
|
// To avoid this problem, and to avoid doing a load right after a store,
|
|
|
|
// we emit a copy from PhysReg into the designated register for this
|
|
|
|
// operand.
|
|
|
|
unsigned DesignatedReg = VRM.getPhys(VirtReg);
|
|
|
|
assert(DesignatedReg && "Must map virtreg to physreg!");
|
|
|
|
|
|
|
|
// 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.hasReuses())
|
|
|
|
DesignatedReg = ReusedOperands.GetRegForReload(DesignatedReg, &MI,
|
2007-08-13 23:45:17 +00:00
|
|
|
Spills, MaybeDeadStores, RegKills, KillOps, VRM);
|
When we have a two-address instruction where the input cannot be clobbered
and is already available, instead of falling back to emitting a load, fall
back to emitting a reg-reg copy. This generates significantly better code
for some SSE testcases, as SSE has lots of two-address instructions and
none of them are read/modify/write. As one example, this change does:
pshufd %XMM5, XMMWORD PTR [%ESP + 84], 255
xorps %XMM2, %XMM5
cmpltps %XMM1, %XMM0
- movaps XMMWORD PTR [%ESP + 52], %XMM0
- movapd %XMM6, XMMWORD PTR [%ESP + 52]
+ movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 68]
movapd XMMWORD PTR [%ESP + 52], %XMM6
movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 36]
cmpltps %XMM3, %XMM0
- movaps XMMWORD PTR [%ESP + 20], %XMM0
- movapd %XMM7, XMMWORD PTR [%ESP + 20]
+ movaps %XMM7, %XMM0
cmpltps %XMM7, XMMWORD PTR [%ESP + 4]
movapd XMMWORD PTR [%ESP + 20], %XMM7
cmpltps %XMM4, %XMM0
... which is far better than a store followed by a load!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28001 91177308-0d34-0410-b5e6-96231b3b80d8
2006-04-28 01:46:50 +00:00
|
|
|
|
2006-04-28 04:43:18 +00:00
|
|
|
// If the mapped designated register is actually the physreg we have
|
|
|
|
// incoming, we don't need to inserted a dead copy.
|
|
|
|
if (DesignatedReg == PhysReg) {
|
|
|
|
// If this stack slot value is already available, reuse it!
|
2007-08-14 05:42:54 +00:00
|
|
|
if (ReuseSlot > VirtRegMap::MAX_STACK_SLOT)
|
|
|
|
DOUT << "Reusing RM#" << ReuseSlot-VirtRegMap::MAX_STACK_SLOT-1;
|
2007-03-20 08:13:50 +00:00
|
|
|
else
|
2007-08-14 05:42:54 +00:00
|
|
|
DOUT << "Reusing SS#" << ReuseSlot;
|
2007-03-20 08:13:50 +00:00
|
|
|
DOUT << " from physreg " << MRI->getName(PhysReg) << " for vreg"
|
2006-11-17 02:09:07 +00:00
|
|
|
<< VirtReg
|
|
|
|
<< " instead of reloading into same physreg.\n";
|
2006-05-04 17:52:23 +00:00
|
|
|
MI.getOperand(i).setReg(PhysReg);
|
2006-11-04 00:21:55 +00:00
|
|
|
ReusedOperands.markClobbered(PhysReg);
|
2006-04-28 04:43:18 +00:00
|
|
|
++NumReused;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2007-04-25 22:13:27 +00:00
|
|
|
const TargetRegisterClass* RC = MF.getSSARegMap()->getRegClass(VirtReg);
|
|
|
|
MF.setPhysRegUsed(DesignatedReg);
|
2006-11-04 00:21:55 +00:00
|
|
|
ReusedOperands.markClobbered(DesignatedReg);
|
2007-09-26 06:25:56 +00:00
|
|
|
MRI->copyRegToReg(MBB, &MI, DesignatedReg, PhysReg, RC, RC);
|
2007-02-25 09:51:27 +00:00
|
|
|
|
2007-03-02 08:52:00 +00:00
|
|
|
MachineInstr *CopyMI = prior(MII);
|
2007-07-11 05:28:39 +00:00
|
|
|
UpdateKills(*CopyMI, RegKills, KillOps);
|
2007-02-25 09:51:27 +00:00
|
|
|
|
When we have a two-address instruction where the input cannot be clobbered
and is already available, instead of falling back to emitting a load, fall
back to emitting a reg-reg copy. This generates significantly better code
for some SSE testcases, as SSE has lots of two-address instructions and
none of them are read/modify/write. As one example, this change does:
pshufd %XMM5, XMMWORD PTR [%ESP + 84], 255
xorps %XMM2, %XMM5
cmpltps %XMM1, %XMM0
- movaps XMMWORD PTR [%ESP + 52], %XMM0
- movapd %XMM6, XMMWORD PTR [%ESP + 52]
+ movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 68]
movapd XMMWORD PTR [%ESP + 52], %XMM6
movaps %XMM6, %XMM0
cmpltps %XMM6, XMMWORD PTR [%ESP + 36]
cmpltps %XMM3, %XMM0
- movaps XMMWORD PTR [%ESP + 20], %XMM0
- movapd %XMM7, XMMWORD PTR [%ESP + 20]
+ movaps %XMM7, %XMM0
cmpltps %XMM7, XMMWORD PTR [%ESP + 4]
movapd XMMWORD PTR [%ESP + 20], %XMM7
cmpltps %XMM4, %XMM0
... which is far better than a store followed by a load!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28001 91177308-0d34-0410-b5e6-96231b3b80d8
2006-04-28 01:46:50 +00:00
|
|
|
// This invalidates DesignatedReg.
|
|
|
|
Spills.ClobberPhysReg(DesignatedReg);
|
|
|
|
|
2007-08-14 05:42:54 +00:00
|
|
|
Spills.addAvailable(ReuseSlot, &MI, DesignatedReg);
|
2006-05-04 17:52:23 +00:00
|
|
|
MI.getOperand(i).setReg(DesignatedReg);
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << '\t' << *prior(MII);
|
2005-09-09 20:29:51 +00:00
|
|
|
++NumReused;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Otherwise, reload it and remember that we have it.
|
|
|
|
PhysReg = VRM.getPhys(VirtReg);
|
2006-01-04 06:47:48 +00:00
|
|
|
assert(PhysReg && "Must map virtreg to physreg!");
|
2007-04-25 22:13:27 +00:00
|
|
|
const TargetRegisterClass* RC = MF.getSSARegMap()->getRegClass(VirtReg);
|
2005-09-09 20:29: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.
|
2006-02-25 01:51:33 +00:00
|
|
|
if (ReusedOperands.hasReuses())
|
|
|
|
PhysReg = ReusedOperands.GetRegForReload(PhysReg, &MI,
|
2007-08-13 23:45:17 +00:00
|
|
|
Spills, MaybeDeadStores, RegKills, KillOps, VRM);
|
2006-02-25 01:51:33 +00:00
|
|
|
|
2007-04-25 22:13:27 +00:00
|
|
|
MF.setPhysRegUsed(PhysReg);
|
2006-11-04 00:21:55 +00:00
|
|
|
ReusedOperands.markClobbered(PhysReg);
|
2007-08-13 23:45:17 +00:00
|
|
|
if (DoReMat) {
|
2007-03-20 08:13:50 +00:00
|
|
|
MRI->reMaterialize(MBB, &MI, PhysReg, VRM.getReMaterializedMI(VirtReg));
|
2007-04-04 07:40:01 +00:00
|
|
|
++NumReMats;
|
|
|
|
} else {
|
2007-08-13 23:45:17 +00:00
|
|
|
MRI->loadRegFromStackSlot(MBB, &MI, PhysReg, SSorRMId, RC);
|
2007-04-04 07:40:01 +00:00
|
|
|
++NumLoads;
|
|
|
|
}
|
2005-09-09 20:29:51 +00:00
|
|
|
// This invalidates PhysReg.
|
2006-02-03 23:13:58 +00:00
|
|
|
Spills.ClobberPhysReg(PhysReg);
|
2005-09-09 20:29:51 +00:00
|
|
|
|
|
|
|
// Any stores to this stack slot are not dead anymore.
|
2007-08-13 23:45:17 +00:00
|
|
|
if (!DoReMat)
|
2007-08-14 09:11:18 +00:00
|
|
|
MaybeDeadStores[SSorRMId] = NULL;
|
2007-08-13 23:45:17 +00:00
|
|
|
Spills.addAvailable(SSorRMId, &MI, PhysReg);
|
2007-02-25 09:51:27 +00:00
|
|
|
// Assumes this is the last use. IsKill will be unset if reg is reused
|
|
|
|
// unless it's a two-address operand.
|
|
|
|
if (TID->getOperandConstraint(i, TOI::TIED_TO) == -1)
|
|
|
|
MI.getOperand(i).setIsKill();
|
2006-05-04 17:52:23 +00:00
|
|
|
MI.getOperand(i).setReg(PhysReg);
|
2007-07-11 05:28:39 +00:00
|
|
|
UpdateKills(*prior(MII), RegKills, KillOps);
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << '\t' << *prior(MII);
|
2004-09-30 01:54:45 +00:00
|
|
|
}
|
2004-02-24 08:58:30 +00:00
|
|
|
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << '\t' << MI;
|
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 we have folded references to memory operands, make sure we clear all
|
|
|
|
// physical registers that may contain the value of the spilled virtual
|
|
|
|
// register
|
2007-08-15 20:20:34 +00:00
|
|
|
SmallSet<int, 1> FoldedSS;
|
2005-01-14 15:54:24 +00:00
|
|
|
for (tie(I, End) = VRM.getFoldedVirts(&MI); I != End; ++I) {
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << "Folded vreg: " << I->second.first << " MR: "
|
|
|
|
<< I->second.second;
|
2004-10-01 23:15:36 +00:00
|
|
|
unsigned VirtReg = I->second.first;
|
|
|
|
VirtRegMap::ModRef MR = I->second.second;
|
2007-08-13 23:45:17 +00:00
|
|
|
if (VRM.isAssignedReg(VirtReg)) {
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << ": No stack slot!\n";
|
Teach the local spiller to turn stack slot loads into register-register copies
when possible, avoiding the load (and avoiding the copy if the value is already
in the right register).
This patch came about when I noticed code like the following being generated:
store R17 -> [SS1]
...blah...
R4 = load [SS1]
This was causing an LSU reject on the G5. This problem was due to the register
allocator folding spill code into a reg-reg copy (producing the load), which
prevented the spiller from being able to rewrite the load into a copy, despite
the fact that the value was already available in a register. In the case
above, we now rip out the R4 load and replace it with a R4 = R17 copy.
This speeds up several programs on X86 (which spills a lot :) ), e.g.
smg2k from 22.39->20.60s, povray from 12.93->12.66s, 168.wupwise from
68.54->53.83s (!), 197.parser from 7.33->6.62s (!), etc. This may have a larger
impact in some cases on the G5 (by avoiding LSU rejects), though it probably
won't trigger as often (less spilling in general).
Targets that implement folding of loads/stores into copies should implement
the isLoadFromStackSlot hook to get this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23388 91177308-0d34-0410-b5e6-96231b3b80d8
2005-09-19 06:56:21 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
int SS = VRM.getStackSlot(VirtReg);
|
2007-08-15 20:20:34 +00:00
|
|
|
FoldedSS.insert(SS);
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << " - StackSlot: " << SS << "\n";
|
Teach the local spiller to turn stack slot loads into register-register copies
when possible, avoiding the load (and avoiding the copy if the value is already
in the right register).
This patch came about when I noticed code like the following being generated:
store R17 -> [SS1]
...blah...
R4 = load [SS1]
This was causing an LSU reject on the G5. This problem was due to the register
allocator folding spill code into a reg-reg copy (producing the load), which
prevented the spiller from being able to rewrite the load into a copy, despite
the fact that the value was already available in a register. In the case
above, we now rip out the R4 load and replace it with a R4 = R17 copy.
This speeds up several programs on X86 (which spills a lot :) ), e.g.
smg2k from 22.39->20.60s, povray from 12.93->12.66s, 168.wupwise from
68.54->53.83s (!), 197.parser from 7.33->6.62s (!), etc. This may have a larger
impact in some cases on the G5 (by avoiding LSU rejects), though it probably
won't trigger as often (less spilling in general).
Targets that implement folding of loads/stores into copies should implement
the isLoadFromStackSlot hook to get this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23388 91177308-0d34-0410-b5e6-96231b3b80d8
2005-09-19 06:56:21 +00:00
|
|
|
|
|
|
|
// If this folded instruction is just a use, check to see if it's a
|
|
|
|
// straight load from the virt reg slot.
|
|
|
|
if ((MR & VirtRegMap::isRef) && !(MR & VirtRegMap::isMod)) {
|
|
|
|
int FrameIdx;
|
2006-02-02 20:12:32 +00:00
|
|
|
if (unsigned DestReg = TII->isLoadFromStackSlot(&MI, FrameIdx)) {
|
2006-10-12 17:45:38 +00:00
|
|
|
if (FrameIdx == SS) {
|
|
|
|
// If this spill slot is available, turn it into a copy (or nothing)
|
|
|
|
// instead of leaving it as a load!
|
2007-08-13 23:45:17 +00:00
|
|
|
if (unsigned InReg = Spills.getSpillSlotOrReMatPhysReg(SS)) {
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << "Promoted Load To Copy: " << MI;
|
2006-10-12 17:45:38 +00:00
|
|
|
if (DestReg != InReg) {
|
2007-09-26 06:25:56 +00:00
|
|
|
const TargetRegisterClass *RC =
|
|
|
|
MF.getSSARegMap()->getRegClass(VirtReg);
|
|
|
|
MRI->copyRegToReg(MBB, &MI, DestReg, InReg, RC, RC);
|
2006-10-12 17:45:38 +00:00
|
|
|
// Revisit the copy so we make sure to notice the effects of the
|
|
|
|
// operation on the destreg (either needing to RA it if it's
|
|
|
|
// virtual or needing to clobber any values if it's physical).
|
|
|
|
NextMII = &MI;
|
|
|
|
--NextMII; // backtrack to the copy.
|
2007-07-11 05:28:39 +00:00
|
|
|
BackTracked = true;
|
2007-02-25 09:51:27 +00:00
|
|
|
} else
|
|
|
|
DOUT << "Removing now-noop copy: " << MI;
|
|
|
|
|
2006-10-12 17:45:38 +00:00
|
|
|
VRM.RemoveFromFoldedVirtMap(&MI);
|
|
|
|
MBB.erase(&MI);
|
2007-07-11 05:28:39 +00:00
|
|
|
Erased = true;
|
2006-10-12 17:45:38 +00:00
|
|
|
goto ProcessNextInst;
|
Teach the local spiller to turn stack slot loads into register-register copies
when possible, avoiding the load (and avoiding the copy if the value is already
in the right register).
This patch came about when I noticed code like the following being generated:
store R17 -> [SS1]
...blah...
R4 = load [SS1]
This was causing an LSU reject on the G5. This problem was due to the register
allocator folding spill code into a reg-reg copy (producing the load), which
prevented the spiller from being able to rewrite the load into a copy, despite
the fact that the value was already available in a register. In the case
above, we now rip out the R4 load and replace it with a R4 = R17 copy.
This speeds up several programs on X86 (which spills a lot :) ), e.g.
smg2k from 22.39->20.60s, povray from 12.93->12.66s, 168.wupwise from
68.54->53.83s (!), 197.parser from 7.33->6.62s (!), etc. This may have a larger
impact in some cases on the G5 (by avoiding LSU rejects), though it probably
won't trigger as often (less spilling in general).
Targets that implement folding of loads/stores into copies should implement
the isLoadFromStackSlot hook to get this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23388 91177308-0d34-0410-b5e6-96231b3b80d8
2005-09-19 06:56:21 +00:00
|
|
|
}
|
2004-10-01 23:15:36 +00:00
|
|
|
}
|
|
|
|
}
|
Teach the local spiller to turn stack slot loads into register-register copies
when possible, avoiding the load (and avoiding the copy if the value is already
in the right register).
This patch came about when I noticed code like the following being generated:
store R17 -> [SS1]
...blah...
R4 = load [SS1]
This was causing an LSU reject on the G5. This problem was due to the register
allocator folding spill code into a reg-reg copy (producing the load), which
prevented the spiller from being able to rewrite the load into a copy, despite
the fact that the value was already available in a register. In the case
above, we now rip out the R4 load and replace it with a R4 = R17 copy.
This speeds up several programs on X86 (which spills a lot :) ), e.g.
smg2k from 22.39->20.60s, povray from 12.93->12.66s, 168.wupwise from
68.54->53.83s (!), 197.parser from 7.33->6.62s (!), etc. This may have a larger
impact in some cases on the G5 (by avoiding LSU rejects), though it probably
won't trigger as often (less spilling in general).
Targets that implement folding of loads/stores into copies should implement
the isLoadFromStackSlot hook to get this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23388 91177308-0d34-0410-b5e6-96231b3b80d8
2005-09-19 06:56:21 +00:00
|
|
|
}
|
2004-10-01 19:47:12 +00:00
|
|
|
|
Teach the local spiller to turn stack slot loads into register-register copies
when possible, avoiding the load (and avoiding the copy if the value is already
in the right register).
This patch came about when I noticed code like the following being generated:
store R17 -> [SS1]
...blah...
R4 = load [SS1]
This was causing an LSU reject on the G5. This problem was due to the register
allocator folding spill code into a reg-reg copy (producing the load), which
prevented the spiller from being able to rewrite the load into a copy, despite
the fact that the value was already available in a register. In the case
above, we now rip out the R4 load and replace it with a R4 = R17 copy.
This speeds up several programs on X86 (which spills a lot :) ), e.g.
smg2k from 22.39->20.60s, povray from 12.93->12.66s, 168.wupwise from
68.54->53.83s (!), 197.parser from 7.33->6.62s (!), etc. This may have a larger
impact in some cases on the G5 (by avoiding LSU rejects), though it probably
won't trigger as often (less spilling in general).
Targets that implement folding of loads/stores into copies should implement
the isLoadFromStackSlot hook to get this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23388 91177308-0d34-0410-b5e6-96231b3b80d8
2005-09-19 06:56:21 +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.
|
2007-08-14 09:11:18 +00:00
|
|
|
MachineInstr* DeadStore = MaybeDeadStores[SS];
|
|
|
|
if (DeadStore) {
|
|
|
|
if (!(MR & VirtRegMap::isRef)) { // Previous store is dead.
|
Teach the local spiller to turn stack slot loads into register-register copies
when possible, avoiding the load (and avoiding the copy if the value is already
in the right register).
This patch came about when I noticed code like the following being generated:
store R17 -> [SS1]
...blah...
R4 = load [SS1]
This was causing an LSU reject on the G5. This problem was due to the register
allocator folding spill code into a reg-reg copy (producing the load), which
prevented the spiller from being able to rewrite the load into a copy, despite
the fact that the value was already available in a register. In the case
above, we now rip out the R4 load and replace it with a R4 = R17 copy.
This speeds up several programs on X86 (which spills a lot :) ), e.g.
smg2k from 22.39->20.60s, povray from 12.93->12.66s, 168.wupwise from
68.54->53.83s (!), 197.parser from 7.33->6.62s (!), etc. This may have a larger
impact in some cases on the G5 (by avoiding LSU rejects), though it probably
won't trigger as often (less spilling in general).
Targets that implement folding of loads/stores into copies should implement
the isLoadFromStackSlot hook to get this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23388 91177308-0d34-0410-b5e6-96231b3b80d8
2005-09-19 06:56:21 +00:00
|
|
|
// If we get here, the store is dead, nuke it now.
|
2006-05-01 21:16:03 +00:00
|
|
|
assert(VirtRegMap::isMod && "Can't be modref!");
|
2007-08-14 09:11:18 +00:00
|
|
|
DOUT << "Removed dead store:\t" << *DeadStore;
|
|
|
|
InvalidateKills(*DeadStore, RegKills, KillOps);
|
|
|
|
MBB.erase(DeadStore);
|
|
|
|
VRM.RemoveFromFoldedVirtMap(DeadStore);
|
2006-05-01 21:16:03 +00:00
|
|
|
++NumDSE;
|
Teach the local spiller to turn stack slot loads into register-register copies
when possible, avoiding the load (and avoiding the copy if the value is already
in the right register).
This patch came about when I noticed code like the following being generated:
store R17 -> [SS1]
...blah...
R4 = load [SS1]
This was causing an LSU reject on the G5. This problem was due to the register
allocator folding spill code into a reg-reg copy (producing the load), which
prevented the spiller from being able to rewrite the load into a copy, despite
the fact that the value was already available in a register. In the case
above, we now rip out the R4 load and replace it with a R4 = R17 copy.
This speeds up several programs on X86 (which spills a lot :) ), e.g.
smg2k from 22.39->20.60s, povray from 12.93->12.66s, 168.wupwise from
68.54->53.83s (!), 197.parser from 7.33->6.62s (!), etc. This may have a larger
impact in some cases on the G5 (by avoiding LSU rejects), though it probably
won't trigger as often (less spilling in general).
Targets that implement folding of loads/stores into copies should implement
the isLoadFromStackSlot hook to get this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23388 91177308-0d34-0410-b5e6-96231b3b80d8
2005-09-19 06:56:21 +00:00
|
|
|
}
|
2007-08-14 09:11:18 +00:00
|
|
|
MaybeDeadStores[SS] = NULL;
|
Teach the local spiller to turn stack slot loads into register-register copies
when possible, avoiding the load (and avoiding the copy if the value is already
in the right register).
This patch came about when I noticed code like the following being generated:
store R17 -> [SS1]
...blah...
R4 = load [SS1]
This was causing an LSU reject on the G5. This problem was due to the register
allocator folding spill code into a reg-reg copy (producing the load), which
prevented the spiller from being able to rewrite the load into a copy, despite
the fact that the value was already available in a register. In the case
above, we now rip out the R4 load and replace it with a R4 = R17 copy.
This speeds up several programs on X86 (which spills a lot :) ), e.g.
smg2k from 22.39->20.60s, povray from 12.93->12.66s, 168.wupwise from
68.54->53.83s (!), 197.parser from 7.33->6.62s (!), etc. This may have a larger
impact in some cases on the G5 (by avoiding LSU rejects), though it probably
won't trigger as often (less spilling in general).
Targets that implement folding of loads/stores into copies should implement
the isLoadFromStackSlot hook to get this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23388 91177308-0d34-0410-b5e6-96231b3b80d8
2005-09-19 06:56:21 +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) {
|
Physregs may hold multiple stack slot values at the same time. Keep track
of this, and use it to our advantage (bwahahah). This allows us to eliminate another
60 instructions from smg2000 on PPC (probably significantly more on X86). A common
old-new diff looks like this:
stw r2, 3304(r1)
- lwz r2, 3192(r1)
stw r2, 3300(r1)
- lwz r2, 3192(r1)
stw r2, 3296(r1)
- lwz r2, 3192(r1)
stw r2, 3200(r1)
- lwz r2, 3192(r1)
stw r2, 3196(r1)
- lwz r2, 3192(r1)
+ or r2, r2, r2
stw r2, 3188(r1)
and
- lwz r31, 604(r1)
- lwz r13, 604(r1)
- lwz r14, 604(r1)
- lwz r15, 604(r1)
- lwz r16, 604(r1)
- lwz r30, 604(r1)
+ or r31, r30, r30
+ or r13, r30, r30
+ or r14, r30, r30
+ or r15, r30, r30
+ or r16, r30, r30
+ or r30, r30, r30
Removal of the R = R copies is coming next...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25919 91177308-0d34-0410-b5e6-96231b3b80d8
2006-02-03 00:36:31 +00:00
|
|
|
// Notice that the value in this stack slot has been modified.
|
2007-08-13 23:45:17 +00:00
|
|
|
Spills.ModifyStackSlotOrReMat(SS);
|
Fix a deficiency in the spiller that Evan noticed. In particular, consider
this code:
store [stack slot #0], R10
= add R14, [stack slot #0]
The spiller didn't know that the store made the value of [stackslot#0] available
in R10 *IF* the store came from a copy instruction with the store folded into it.
This patch teaches VirtRegMap to look at these stores and recognize the values
they make available. In one case Evan provided, this code:
divsd %XMM0, %XMM1
movsd %XMM1, QWORD PTR [%ESP + 40]
1) movsd QWORD PTR [%ESP + 48], %XMM1
2) movsd %XMM1, QWORD PTR [%ESP + 48]
addsd %XMM1, %XMM0
3) movsd QWORD PTR [%ESP + 48], %XMM1
movsd QWORD PTR [%ESP + 4], %XMM0
turns into:
divsd %XMM0, %XMM1
movsd %XMM1, QWORD PTR [%ESP + 40]
addsd %XMM1, %XMM0
3) movsd QWORD PTR [%ESP + 48], %XMM1
movsd QWORD PTR [%ESP + 4], %XMM0
In this case, instruction #2 was removed because of the value made
available by #1, and inst #1 was later deleted because it is now
never used before the stack slot is redefined by #3.
This occurs here and there in a lot of code with high spilling, on PPC
most of the removed loads/stores are LSU-reject-causing loads, which is
nice.
On X86, things are much better (because it spills more), where we nuke
about 1% of the instructions from SMG2000 and several hundred from eon.
More improvements to come...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25917 91177308-0d34-0410-b5e6-96231b3b80d8
2006-02-02 23:29:36 +00:00
|
|
|
|
|
|
|
// If this is *just* a mod of the value, check to see if this is just a
|
|
|
|
// store to the spill slot (i.e. the spill got merged into the copy). If
|
|
|
|
// so, realize that the vreg is available now, and add the store to the
|
|
|
|
// MaybeDeadStore info.
|
|
|
|
int StackSlot;
|
|
|
|
if (!(MR & VirtRegMap::isRef)) {
|
|
|
|
if (unsigned SrcReg = TII->isStoreToStackSlot(&MI, StackSlot)) {
|
|
|
|
assert(MRegisterInfo::isPhysicalRegister(SrcReg) &&
|
|
|
|
"Src hasn't been allocated yet?");
|
Physregs may hold multiple stack slot values at the same time. Keep track
of this, and use it to our advantage (bwahahah). This allows us to eliminate another
60 instructions from smg2000 on PPC (probably significantly more on X86). A common
old-new diff looks like this:
stw r2, 3304(r1)
- lwz r2, 3192(r1)
stw r2, 3300(r1)
- lwz r2, 3192(r1)
stw r2, 3296(r1)
- lwz r2, 3192(r1)
stw r2, 3200(r1)
- lwz r2, 3192(r1)
stw r2, 3196(r1)
- lwz r2, 3192(r1)
+ or r2, r2, r2
stw r2, 3188(r1)
and
- lwz r31, 604(r1)
- lwz r13, 604(r1)
- lwz r14, 604(r1)
- lwz r15, 604(r1)
- lwz r16, 604(r1)
- lwz r30, 604(r1)
+ or r31, r30, r30
+ or r13, r30, r30
+ or r14, r30, r30
+ or r15, r30, r30
+ or r16, r30, r30
+ or r30, r30, r30
Removal of the R = R copies is coming next...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25919 91177308-0d34-0410-b5e6-96231b3b80d8
2006-02-03 00:36:31 +00:00
|
|
|
// Okay, this is certainly a store of SrcReg to [StackSlot]. Mark
|
Fix a deficiency in the spiller that Evan noticed. In particular, consider
this code:
store [stack slot #0], R10
= add R14, [stack slot #0]
The spiller didn't know that the store made the value of [stackslot#0] available
in R10 *IF* the store came from a copy instruction with the store folded into it.
This patch teaches VirtRegMap to look at these stores and recognize the values
they make available. In one case Evan provided, this code:
divsd %XMM0, %XMM1
movsd %XMM1, QWORD PTR [%ESP + 40]
1) movsd QWORD PTR [%ESP + 48], %XMM1
2) movsd %XMM1, QWORD PTR [%ESP + 48]
addsd %XMM1, %XMM0
3) movsd QWORD PTR [%ESP + 48], %XMM1
movsd QWORD PTR [%ESP + 4], %XMM0
turns into:
divsd %XMM0, %XMM1
movsd %XMM1, QWORD PTR [%ESP + 40]
addsd %XMM1, %XMM0
3) movsd QWORD PTR [%ESP + 48], %XMM1
movsd QWORD PTR [%ESP + 4], %XMM0
In this case, instruction #2 was removed because of the value made
available by #1, and inst #1 was later deleted because it is now
never used before the stack slot is redefined by #3.
This occurs here and there in a lot of code with high spilling, on PPC
most of the removed loads/stores are LSU-reject-causing loads, which is
nice.
On X86, things are much better (because it spills more), where we nuke
about 1% of the instructions from SMG2000 and several hundred from eon.
More improvements to come...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25917 91177308-0d34-0410-b5e6-96231b3b80d8
2006-02-02 23:29:36 +00:00
|
|
|
// this as a potentially dead store in case there is a subsequent
|
|
|
|
// store into the stack slot without a read from it.
|
|
|
|
MaybeDeadStores[StackSlot] = &MI;
|
|
|
|
|
|
|
|
// If the stack slot value was previously available in some other
|
|
|
|
// register, change it now. Otherwise, make the register available,
|
|
|
|
// in PhysReg.
|
2007-02-23 01:13:26 +00:00
|
|
|
Spills.addAvailable(StackSlot, &MI, SrcReg, false/*don't clobber*/);
|
Fix a deficiency in the spiller that Evan noticed. In particular, consider
this code:
store [stack slot #0], R10
= add R14, [stack slot #0]
The spiller didn't know that the store made the value of [stackslot#0] available
in R10 *IF* the store came from a copy instruction with the store folded into it.
This patch teaches VirtRegMap to look at these stores and recognize the values
they make available. In one case Evan provided, this code:
divsd %XMM0, %XMM1
movsd %XMM1, QWORD PTR [%ESP + 40]
1) movsd QWORD PTR [%ESP + 48], %XMM1
2) movsd %XMM1, QWORD PTR [%ESP + 48]
addsd %XMM1, %XMM0
3) movsd QWORD PTR [%ESP + 48], %XMM1
movsd QWORD PTR [%ESP + 4], %XMM0
turns into:
divsd %XMM0, %XMM1
movsd %XMM1, QWORD PTR [%ESP + 40]
addsd %XMM1, %XMM0
3) movsd QWORD PTR [%ESP + 48], %XMM1
movsd QWORD PTR [%ESP + 4], %XMM0
In this case, instruction #2 was removed because of the value made
available by #1, and inst #1 was later deleted because it is now
never used before the stack slot is redefined by #3.
This occurs here and there in a lot of code with high spilling, on PPC
most of the removed loads/stores are LSU-reject-causing loads, which is
nice.
On X86, things are much better (because it spills more), where we nuke
about 1% of the instructions from SMG2000 and several hundred from eon.
More improvements to come...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25917 91177308-0d34-0410-b5e6-96231b3b80d8
2006-02-02 23:29:36 +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
|
|
|
}
|
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();
|
|
|
|
|
|
|
|
if (!MRegisterInfo::isVirtualRegister(VirtReg)) {
|
2006-09-05 02:12:02 +00:00
|
|
|
// Check to see if this is a noop copy. If so, eliminate the
|
|
|
|
// instruction before considering the dest reg to be changed.
|
|
|
|
unsigned Src, Dst;
|
|
|
|
if (TII->isMoveInstr(MI, Src, Dst) && Src == Dst) {
|
|
|
|
++NumDCE;
|
2006-11-17 02:09:07 +00:00
|
|
|
DOUT << "Removing now-noop copy: " << MI;
|
2006-09-05 02:12:02 +00:00
|
|
|
MBB.erase(&MI);
|
2007-07-11 05:28:39 +00:00
|
|
|
Erased = true;
|
2006-09-05 02:12:02 +00:00
|
|
|
VRM.RemoveFromFoldedVirtMap(&MI);
|
2006-12-14 07:54:05 +00:00
|
|
|
Spills.disallowClobberPhysReg(VirtReg);
|
2006-09-05 02:12:02 +00:00
|
|
|
goto ProcessNextInst;
|
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
|
|
|
}
|
2006-10-12 17:45:38 +00:00
|
|
|
|
|
|
|
// If it's not a no-op copy, it clobbers the value in the destreg.
|
2006-09-05 02:12:02 +00:00
|
|
|
Spills.ClobberPhysReg(VirtReg);
|
2006-11-04 00:21:55 +00:00
|
|
|
ReusedOperands.markClobbered(VirtReg);
|
2006-10-12 17:45:38 +00:00
|
|
|
|
|
|
|
// Check to see if this instruction is a load from a stack slot into
|
|
|
|
// a register. If so, this provides the stack slot value in the reg.
|
|
|
|
int FrameIdx;
|
|
|
|
if (unsigned DestReg = TII->isLoadFromStackSlot(&MI, FrameIdx)) {
|
|
|
|
assert(DestReg == VirtReg && "Unknown load situation!");
|
2007-08-15 20:20:34 +00:00
|
|
|
|
|
|
|
// If it is a folded reference, then it's not safe to clobber.
|
|
|
|
bool Folded = FoldedSS.count(FrameIdx);
|
2006-10-12 17:45:38 +00:00
|
|
|
// Otherwise, if it wasn't available, remember that it is now!
|
2007-08-15 20:20:34 +00:00
|
|
|
Spills.addAvailable(FrameIdx, &MI, DestReg, !Folded);
|
2006-10-12 17:45:38 +00:00
|
|
|
goto ProcessNextInst;
|
|
|
|
}
|
|
|
|
|
2006-09-05 02:12:02 +00:00
|
|
|
continue;
|
2005-04-21 22:36:52 +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
|
|
|
|
2007-08-14 23:25:37 +00:00
|
|
|
bool DoReMat = VRM.isReMaterialized(VirtReg);
|
|
|
|
if (DoReMat)
|
|
|
|
ReMatDefs.insert(&MI);
|
|
|
|
|
2006-02-03 03:06:49 +00:00
|
|
|
// The only vregs left are stack slot definitions.
|
|
|
|
int StackSlot = VRM.getStackSlot(VirtReg);
|
2007-04-25 22:13:27 +00:00
|
|
|
const TargetRegisterClass *RC = MF.getSSARegMap()->getRegClass(VirtReg);
|
2006-02-03 03:06:49 +00:00
|
|
|
|
2006-09-05 02:12:02 +00:00
|
|
|
// If this def is part of a two-address operand, make sure to execute
|
|
|
|
// the store from the correct physical register.
|
|
|
|
unsigned PhysReg;
|
2006-12-08 18:45:48 +00:00
|
|
|
int TiedOp = MI.getInstrDescriptor()->findTiedToSrcOperand(i);
|
2006-11-01 23:06:55 +00:00
|
|
|
if (TiedOp != -1)
|
|
|
|
PhysReg = MI.getOperand(TiedOp).getReg();
|
2006-11-04 00:21:55 +00:00
|
|
|
else {
|
2006-09-05 02:12:02 +00:00
|
|
|
PhysReg = VRM.getPhys(VirtReg);
|
2006-11-04 00:21:55 +00:00
|
|
|
if (ReusedOperands.isClobbered(PhysReg)) {
|
|
|
|
// Another def has taken the assigned physreg. It must have been a
|
|
|
|
// use&def which got it due to reuse. Undo the reuse!
|
|
|
|
PhysReg = ReusedOperands.GetRegForReload(PhysReg, &MI,
|
2007-08-13 23:45:17 +00:00
|
|
|
Spills, MaybeDeadStores, RegKills, KillOps, VRM);
|
2006-11-04 00:21:55 +00:00
|
|
|
}
|
|
|
|
}
|
2006-02-03 03:06:49 +00:00
|
|
|
|
2007-04-25 22:13:27 +00:00
|
|
|
MF.setPhysRegUsed(PhysReg);
|
2006-11-04 00:21:55 +00:00
|
|
|
ReusedOperands.markClobbered(PhysReg);
|
2006-05-04 17:52:23 +00:00
|
|
|
MI.getOperand(i).setReg(PhysReg);
|
2007-08-14 23:25:37 +00:00
|
|
|
if (!MO.isDead()) {
|
|
|
|
MRI->storeRegToStackSlot(MBB, next(MII), PhysReg, StackSlot, RC);
|
|
|
|
DOUT << "Store:\t" << *next(MII);
|
|
|
|
|
|
|
|
// If there is a dead store to this stack slot, nuke it now.
|
|
|
|
MachineInstr *&LastStore = MaybeDeadStores[StackSlot];
|
|
|
|
if (LastStore) {
|
|
|
|
DOUT << "Removed dead store:\t" << *LastStore;
|
|
|
|
++NumDSE;
|
|
|
|
SmallVector<unsigned, 1> KillRegs;
|
|
|
|
InvalidateKills(*LastStore, RegKills, KillOps, &KillRegs);
|
|
|
|
MachineBasicBlock::iterator PrevMII = LastStore;
|
|
|
|
bool CheckDef = PrevMII != MBB.begin();
|
|
|
|
if (CheckDef)
|
|
|
|
--PrevMII;
|
|
|
|
MBB.erase(LastStore);
|
|
|
|
VRM.RemoveFromFoldedVirtMap(LastStore);
|
|
|
|
if (CheckDef) {
|
|
|
|
// Look at defs of killed registers on the store. Mark the defs
|
|
|
|
// as dead since the store has been deleted and they aren't
|
|
|
|
// being reused.
|
|
|
|
for (unsigned j = 0, ee = KillRegs.size(); j != ee; ++j) {
|
|
|
|
bool HasOtherDef = false;
|
|
|
|
if (InvalidateRegDef(PrevMII, MI, KillRegs[j], HasOtherDef)) {
|
|
|
|
MachineInstr *DeadDef = PrevMII;
|
|
|
|
if (ReMatDefs.count(DeadDef) && !HasOtherDef) {
|
|
|
|
// FIXME: This assumes a remat def does not have side
|
|
|
|
// effects.
|
|
|
|
MBB.erase(DeadDef);
|
|
|
|
VRM.RemoveFromFoldedVirtMap(DeadDef);
|
|
|
|
++NumDRM;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
LastStore = next(MII);
|
2006-02-03 03:06:49 +00:00
|
|
|
|
2007-08-14 23:25:37 +00:00
|
|
|
// If the stack slot value was previously available in some other
|
|
|
|
// register, change it now. Otherwise, make the register available,
|
|
|
|
// in PhysReg.
|
|
|
|
Spills.ModifyStackSlotOrReMat(StackSlot);
|
|
|
|
Spills.ClobberPhysReg(PhysReg);
|
|
|
|
Spills.addAvailable(StackSlot, LastStore, PhysReg);
|
|
|
|
++NumStores;
|
|
|
|
|
|
|
|
// Check to see if this is a noop copy. If so, eliminate the
|
|
|
|
// instruction before considering the dest reg to be changed.
|
|
|
|
{
|
|
|
|
unsigned Src, Dst;
|
|
|
|
if (TII->isMoveInstr(MI, Src, Dst) && Src == Dst) {
|
|
|
|
++NumDCE;
|
|
|
|
DOUT << "Removing now-noop copy: " << MI;
|
|
|
|
MBB.erase(&MI);
|
|
|
|
Erased = true;
|
|
|
|
VRM.RemoveFromFoldedVirtMap(&MI);
|
|
|
|
UpdateKills(*LastStore, RegKills, KillOps);
|
|
|
|
goto ProcessNextInst;
|
|
|
|
}
|
Fixed a long standing spiller bug that's exposed by Thumb:
The code sequence before the spiller is something like:
= tMOVrr
%reg1117 = tMOVrr
%reg1078 = tLSLri %reg1117, 2
The it starts spilling:
%r0 = tRestore <fi#5>, 0
%r1 = tRestore <fi#7>, 0
%r1 = tMOVrr %r1<kill>
tSpill %r1, <fi#5>, 0
%reg1078 = tLSLri %reg1117, 2
It restores the value while processing the first tMOVrr. At this point, the
spiller remembers fi#5 is available in %r0. Next it processes the second move.
It restores the source before the move and spills the result afterwards. The
move becomes a noop and is deleted. However, a spill has been inserted and that
should invalidate reuse of %r0 for fi#5 and add reuse of %r1 for fi#5.
Therefore, %reg1117 (which is also assigned fi#5) should get %r1, not %r0.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34039 91177308-0d34-0410-b5e6-96231b3b80d8
2007-02-08 06:04:54 +00:00
|
|
|
}
|
2007-08-14 23:25:37 +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
|
|
|
}
|
Teach the local spiller to turn stack slot loads into register-register copies
when possible, avoiding the load (and avoiding the copy if the value is already
in the right register).
This patch came about when I noticed code like the following being generated:
store R17 -> [SS1]
...blah...
R4 = load [SS1]
This was causing an LSU reject on the G5. This problem was due to the register
allocator folding spill code into a reg-reg copy (producing the load), which
prevented the spiller from being able to rewrite the load into a copy, despite
the fact that the value was already available in a register. In the case
above, we now rip out the R4 load and replace it with a R4 = R17 copy.
This speeds up several programs on X86 (which spills a lot :) ), e.g.
smg2k from 22.39->20.60s, povray from 12.93->12.66s, 168.wupwise from
68.54->53.83s (!), 197.parser from 7.33->6.62s (!), etc. This may have a larger
impact in some cases on the G5 (by avoiding LSU rejects), though it probably
won't trigger as often (less spilling in general).
Targets that implement folding of loads/stores into copies should implement
the isLoadFromStackSlot hook to get this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23388 91177308-0d34-0410-b5e6-96231b3b80d8
2005-09-19 06:56:21 +00:00
|
|
|
ProcessNextInst:
|
2007-07-11 05:28:39 +00:00
|
|
|
if (!Erased && !BackTracked)
|
|
|
|
for (MachineBasicBlock::iterator II = MI; II != NextMII; ++II)
|
|
|
|
UpdateKills(*II, RegKills, KillOps);
|
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
|
|
|
}
|
|
|
|
|
2006-08-24 22:43:55 +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
|
|
|
}
|