Skip to content

S
swiftshader
Commit 29d15fd6 by Jim Stichnoth
Options

Subzero: Remove unneeded ScratchRegs.

These static members of the various TargetLowering classes are no longer used anywhere and can therefore be removed. BUG= none R=jpp@chromium.org Review URL: https://codereview.chromium.org/1599803002 .
parent 91c773e1
Showing with 7 additions and 33 deletions
src/IceTargetLoweringARM32.cpp
...@@ -286,7 +286,6 @@ void TargetARM32::staticInit(GlobalContext *Ctx) { ...@@ -286,7 +286,6 @@ void TargetARM32::staticInit(GlobalContext *Ctx) {
llvm::SmallBitVector Float64Registers(RegARM32::Reg_NUM); llvm::SmallBitVector Float64Registers(RegARM32::Reg_NUM);
llvm::SmallBitVector VectorRegisters(RegARM32::Reg_NUM); llvm::SmallBitVector VectorRegisters(RegARM32::Reg_NUM);
llvm::SmallBitVector InvalidRegisters(RegARM32::Reg_NUM); llvm::SmallBitVector InvalidRegisters(RegARM32::Reg_NUM);
ScratchRegs.resize(RegARM32::Reg_NUM);
for (int i = 0; i < RegARM32::Reg_NUM; ++i) { for (int i = 0; i < RegARM32::Reg_NUM; ++i) {
const auto &Entry = RegARM32::RegTable[i]; const auto &Entry = RegARM32::RegTable[i];
IntegerRegisters[i] = Entry.IsInt; IntegerRegisters[i] = Entry.IsInt;
...@@ -294,7 +293,6 @@ void TargetARM32::staticInit(GlobalContext *Ctx) { ...@@ -294,7 +293,6 @@ void TargetARM32::staticInit(GlobalContext *Ctx) {
Float32Registers[i] = Entry.IsFP32; Float32Registers[i] = Entry.IsFP32;
Float64Registers[i] = Entry.IsFP64; Float64Registers[i] = Entry.IsFP64;
VectorRegisters[i] = Entry.IsVec128; VectorRegisters[i] = Entry.IsVec128;
ScratchRegs[i] = Entry.Scratch;
RegisterAliases[i].resize(RegARM32::Reg_NUM); RegisterAliases[i].resize(RegARM32::Reg_NUM);
for (int j = 0; j < Entry.NumAliases; ++j) { for (int j = 0; j < Entry.NumAliases; ++j) {
assert(i == j || !RegisterAliases[i][Entry.Aliases[j]]); assert(i == j || !RegisterAliases[i][Entry.Aliases[j]]);
...@@ -6455,7 +6453,6 @@ void TargetHeaderARM32::lower() { ...@@ -6455,7 +6453,6 @@ void TargetHeaderARM32::lower() {
llvm::SmallBitVector TargetARM32::TypeToRegisterSet[IceType_NUM]; llvm::SmallBitVector TargetARM32::TypeToRegisterSet[IceType_NUM];
llvm::SmallBitVector TargetARM32::RegisterAliases[RegARM32::Reg_NUM]; llvm::SmallBitVector TargetARM32::RegisterAliases[RegARM32::Reg_NUM];
llvm::SmallBitVector TargetARM32::ScratchRegs;
} // end of namespace ARM32 } // end of namespace ARM32
} // end of namespace Ice } // end of namespace Ice
src/IceTargetLoweringARM32.h
...@@ -1015,7 +1015,6 @@ protected: ...@@ -1015,7 +1015,6 @@ protected:
// TODO(jpp): std::array instead of array. // TODO(jpp): std::array instead of array.
static llvm::SmallBitVector TypeToRegisterSet[RegARM32::RCARM32_NUM]; static llvm::SmallBitVector TypeToRegisterSet[RegARM32::RCARM32_NUM];
static llvm::SmallBitVector RegisterAliases[RegARM32::Reg_NUM]; static llvm::SmallBitVector RegisterAliases[RegARM32::Reg_NUM];
static llvm::SmallBitVector ScratchRegs;
llvm::SmallBitVector RegsUsed; llvm::SmallBitVector RegsUsed;
VarList PhysicalRegisters[IceType_NUM]; VarList PhysicalRegisters[IceType_NUM];
VarList PreservedGPRs; VarList PreservedGPRs;
......
src/IceTargetLoweringMIPS32.cpp
...@@ -72,7 +72,6 @@ void TargetMIPS32::staticInit(GlobalContext *Ctx) { ...@@ -72,7 +72,6 @@ void TargetMIPS32::staticInit(GlobalContext *Ctx) {
llvm::SmallBitVector Float64Registers(RegMIPS32::Reg_NUM); llvm::SmallBitVector Float64Registers(RegMIPS32::Reg_NUM);
llvm::SmallBitVector VectorRegisters(RegMIPS32::Reg_NUM); llvm::SmallBitVector VectorRegisters(RegMIPS32::Reg_NUM);
llvm::SmallBitVector InvalidRegisters(RegMIPS32::Reg_NUM); llvm::SmallBitVector InvalidRegisters(RegMIPS32::Reg_NUM);
ScratchRegs.resize(RegMIPS32::Reg_NUM);
#define X(val, encode, name, scratch, preserved, stackptr, frameptr, isInt, \ #define X(val, encode, name, scratch, preserved, stackptr, frameptr, isInt, \
isI64Pair, isFP32, isFP64, isVec128, alias_init) \ isI64Pair, isFP32, isFP64, isVec128, alias_init) \
IntegerRegisters[RegMIPS32::val] = isInt; \ IntegerRegisters[RegMIPS32::val] = isInt; \
...@@ -87,8 +86,7 @@ void TargetMIPS32::staticInit(GlobalContext *Ctx) { ...@@ -87,8 +86,7 @@ void TargetMIPS32::staticInit(GlobalContext *Ctx) {
RegisterAliases[RegMIPS32::val].set(RegAlias); \ RegisterAliases[RegMIPS32::val].set(RegAlias); \
} \ } \
RegisterAliases[RegMIPS32::val].resize(RegMIPS32::Reg_NUM); \ RegisterAliases[RegMIPS32::val].resize(RegMIPS32::Reg_NUM); \
assert(RegisterAliases[RegMIPS32::val][RegMIPS32::val]); \ assert(RegisterAliases[RegMIPS32::val][RegMIPS32::val]);
ScratchRegs[RegMIPS32::val] = scratch;
REGMIPS32_TABLE; REGMIPS32_TABLE;
#undef X #undef X
TypeToRegisterSet[IceType_void] = InvalidRegisters; TypeToRegisterSet[IceType_void] = InvalidRegisters;
...@@ -1119,7 +1117,6 @@ void TargetHeaderMIPS32::lower() { ...@@ -1119,7 +1117,6 @@ void TargetHeaderMIPS32::lower() {
llvm::SmallBitVector TargetMIPS32::TypeToRegisterSet[IceType_NUM]; llvm::SmallBitVector TargetMIPS32::TypeToRegisterSet[IceType_NUM];
llvm::SmallBitVector TargetMIPS32::RegisterAliases[RegMIPS32::Reg_NUM]; llvm::SmallBitVector TargetMIPS32::RegisterAliases[RegMIPS32::Reg_NUM];
llvm::SmallBitVector TargetMIPS32::ScratchRegs;
} // end of namespace MIPS32 } // end of namespace MIPS32
} // end of namespace Ice } // end of namespace Ice
src/IceTargetLoweringMIPS32.h
...@@ -264,7 +264,6 @@ protected: ...@@ -264,7 +264,6 @@ protected:
bool NeedsStackAlignment = false; bool NeedsStackAlignment = false;
static llvm::SmallBitVector TypeToRegisterSet[RCMIPS32_NUM]; static llvm::SmallBitVector TypeToRegisterSet[RCMIPS32_NUM];
static llvm::SmallBitVector RegisterAliases[RegMIPS32::Reg_NUM]; static llvm::SmallBitVector RegisterAliases[RegMIPS32::Reg_NUM];
static llvm::SmallBitVector ScratchRegs;
llvm::SmallBitVector RegsUsed; llvm::SmallBitVector RegsUsed;
VarList PhysicalRegisters[IceType_NUM]; VarList PhysicalRegisters[IceType_NUM];
......
src/IceTargetLoweringX8632.cpp
...@@ -111,10 +111,6 @@ std::array<llvm::SmallBitVector, ...@@ -111,10 +111,6 @@ std::array<llvm::SmallBitVector,
TargetX86Base<X8632::Traits>::RegisterAliases = {{}}; TargetX86Base<X8632::Traits>::RegisterAliases = {{}};
template <> template <>
llvm::SmallBitVector
TargetX86Base<X8632::Traits>::ScratchRegs = llvm::SmallBitVector();
template <>
FixupKind TargetX86Base<X8632::Traits>::PcRelFixup = FixupKind TargetX86Base<X8632::Traits>::PcRelFixup =
TargetX86Base<X8632::Traits>::Traits::FK_PcRel; TargetX86Base<X8632::Traits>::Traits::FK_PcRel;
......
src/IceTargetLoweringX8632Traits.h
...@@ -447,8 +447,7 @@ public: ...@@ -447,8 +447,7 @@ public:
static void initRegisterSet( static void initRegisterSet(
const ::Ice::ClFlags & /*Flags*/, const ::Ice::ClFlags & /*Flags*/,
std::array<llvm::SmallBitVector, RCX86_NUM> *TypeToRegisterSet, std::array<llvm::SmallBitVector, RCX86_NUM> *TypeToRegisterSet,
std::array<llvm::SmallBitVector, RegisterSet::Reg_NUM> *RegisterAliases, std::array<llvm::SmallBitVector, RegisterSet::Reg_NUM> *RegisterAliases) {
llvm::SmallBitVector *ScratchRegs) {
llvm::SmallBitVector IntegerRegistersI32(RegisterSet::Reg_NUM); llvm::SmallBitVector IntegerRegistersI32(RegisterSet::Reg_NUM);
llvm::SmallBitVector IntegerRegistersI16(RegisterSet::Reg_NUM); llvm::SmallBitVector IntegerRegistersI16(RegisterSet::Reg_NUM);
llvm::SmallBitVector IntegerRegistersI8(RegisterSet::Reg_NUM); llvm::SmallBitVector IntegerRegistersI8(RegisterSet::Reg_NUM);
...@@ -460,7 +459,6 @@ public: ...@@ -460,7 +459,6 @@ public:
llvm::SmallBitVector Trunc8RcvrRegisters(RegisterSet::Reg_NUM); llvm::SmallBitVector Trunc8RcvrRegisters(RegisterSet::Reg_NUM);
llvm::SmallBitVector AhRcvrRegisters(RegisterSet::Reg_NUM); llvm::SmallBitVector AhRcvrRegisters(RegisterSet::Reg_NUM);
llvm::SmallBitVector InvalidRegisters(RegisterSet::Reg_NUM); llvm::SmallBitVector InvalidRegisters(RegisterSet::Reg_NUM);
ScratchRegs->resize(RegisterSet::Reg_NUM);
static constexpr struct { static constexpr struct {
uint16_t Val; uint16_t Val;
...@@ -474,7 +472,6 @@ public: ...@@ -474,7 +472,6 @@ public:
unsigned Is16To8 : 1; unsigned Is16To8 : 1;
unsigned IsTrunc8Rcvr : 1; unsigned IsTrunc8Rcvr : 1;
unsigned IsAhRcvr : 1; unsigned IsAhRcvr : 1;
unsigned Scratch : 1;
#define NUM_ALIASES_BITS 2 #define NUM_ALIASES_BITS 2
SizeT NumAliases : (NUM_ALIASES_BITS + 1); SizeT NumAliases : (NUM_ALIASES_BITS + 1);
uint16_t Aliases[1 << NUM_ALIASES_BITS]; uint16_t Aliases[1 << NUM_ALIASES_BITS];
...@@ -485,7 +482,7 @@ public: ...@@ -485,7 +482,7 @@ public:
isTrunc8Rcvr, isAhRcvr, aliases) \ isTrunc8Rcvr, isAhRcvr, aliases) \
{ \ { \
RegisterSet::val, is64, is32, is16, is8, isXmm, is64To8, is32To8, is16To8, \ RegisterSet::val, is64, is32, is16, is8, isXmm, is64To8, is32To8, is16To8, \
isTrunc8Rcvr, isAhRcvr, scratch, (SizeOf aliases).size(), aliases, \ isTrunc8Rcvr, isAhRcvr, (SizeOf aliases).size(), aliases, \
} \ } \
, ,
REGX8632_TABLE REGX8632_TABLE
...@@ -511,7 +508,6 @@ public: ...@@ -511,7 +508,6 @@ public:
(*RegisterAliases)[Entry.Val].set(Alias); (*RegisterAliases)[Entry.Val].set(Alias);
} }
(*RegisterAliases)[Entry.Val].set(Entry.Val); (*RegisterAliases)[Entry.Val].set(Entry.Val);
(*ScratchRegs)[Entry.Val] = Entry.Scratch;
} }
(*TypeToRegisterSet)[RC_void] = InvalidRegisters; (*TypeToRegisterSet)[RC_void] = InvalidRegisters;
......
src/IceTargetLoweringX8664.cpp
...@@ -111,10 +111,6 @@ std::array<llvm::SmallBitVector, ...@@ -111,10 +111,6 @@ std::array<llvm::SmallBitVector,
TargetX86Base<X8664::Traits>::RegisterAliases = {{}}; TargetX86Base<X8664::Traits>::RegisterAliases = {{}};
template <> template <>
llvm::SmallBitVector
TargetX86Base<X8664::Traits>::ScratchRegs = llvm::SmallBitVector();
template <>
FixupKind TargetX86Base<X8664::Traits>::PcRelFixup = FixupKind TargetX86Base<X8664::Traits>::PcRelFixup =
TargetX86Base<X8664::Traits>::Traits::FK_PcRel; TargetX86Base<X8664::Traits>::Traits::FK_PcRel;
......
src/IceTargetLoweringX8664Traits.h
...@@ -492,8 +492,7 @@ public: ...@@ -492,8 +492,7 @@ public:
static void initRegisterSet( static void initRegisterSet(
const ::Ice::ClFlags &Flags, const ::Ice::ClFlags &Flags,
std::array<llvm::SmallBitVector, RCX86_NUM> *TypeToRegisterSet, std::array<llvm::SmallBitVector, RCX86_NUM> *TypeToRegisterSet,
std::array<llvm::SmallBitVector, RegisterSet::Reg_NUM> *RegisterAliases, std::array<llvm::SmallBitVector, RegisterSet::Reg_NUM> *RegisterAliases) {
llvm::SmallBitVector *ScratchRegs) {
llvm::SmallBitVector IntegerRegistersI64(RegisterSet::Reg_NUM); llvm::SmallBitVector IntegerRegistersI64(RegisterSet::Reg_NUM);
llvm::SmallBitVector IntegerRegistersI32(RegisterSet::Reg_NUM); llvm::SmallBitVector IntegerRegistersI32(RegisterSet::Reg_NUM);
llvm::SmallBitVector IntegerRegistersI16(RegisterSet::Reg_NUM); llvm::SmallBitVector IntegerRegistersI16(RegisterSet::Reg_NUM);
...@@ -506,7 +505,6 @@ public: ...@@ -506,7 +505,6 @@ public:
llvm::SmallBitVector Trunc8RcvrRegisters(RegisterSet::Reg_NUM); llvm::SmallBitVector Trunc8RcvrRegisters(RegisterSet::Reg_NUM);
llvm::SmallBitVector AhRcvrRegisters(RegisterSet::Reg_NUM); llvm::SmallBitVector AhRcvrRegisters(RegisterSet::Reg_NUM);
llvm::SmallBitVector InvalidRegisters(RegisterSet::Reg_NUM); llvm::SmallBitVector InvalidRegisters(RegisterSet::Reg_NUM);
ScratchRegs->resize(RegisterSet::Reg_NUM);
static constexpr struct { static constexpr struct {
uint16_t Val; uint16_t Val;
...@@ -521,7 +519,6 @@ public: ...@@ -521,7 +519,6 @@ public:
unsigned Is16To8 : 1; unsigned Is16To8 : 1;
unsigned IsTrunc8Rcvr : 1; unsigned IsTrunc8Rcvr : 1;
unsigned IsAhRcvr : 1; unsigned IsAhRcvr : 1;
unsigned Scratch : 1;
#define NUM_ALIASES_BITS 2 #define NUM_ALIASES_BITS 2
SizeT NumAliases : (NUM_ALIASES_BITS + 1); SizeT NumAliases : (NUM_ALIASES_BITS + 1);
uint16_t Aliases[1 << NUM_ALIASES_BITS]; uint16_t Aliases[1 << NUM_ALIASES_BITS];
...@@ -532,8 +529,7 @@ public: ...@@ -532,8 +529,7 @@ public:
is16To8, isTrunc8Rcvr, isAhRcvr, aliases) \ is16To8, isTrunc8Rcvr, isAhRcvr, aliases) \
{ \ { \
RegisterSet::val, sboxres, is64, is32, is16, is8, isXmm, is64To8, is32To8, \ RegisterSet::val, sboxres, is64, is32, is16, is8, isXmm, is64To8, is32To8, \
is16To8, isTrunc8Rcvr, isAhRcvr, scratch, (SizeOf aliases).size(), \ is16To8, isTrunc8Rcvr, isAhRcvr, (SizeOf aliases).size(), aliases, \
aliases, \
} \ } \
, ,
REGX8664_TABLE REGX8664_TABLE
...@@ -570,7 +566,6 @@ public: ...@@ -570,7 +566,6 @@ public:
(Trunc16To8Registers)[Entry.Val] = Entry.Is16To8; (Trunc16To8Registers)[Entry.Val] = Entry.Is16To8;
(Trunc8RcvrRegisters)[Entry.Val] = Entry.IsTrunc8Rcvr; (Trunc8RcvrRegisters)[Entry.Val] = Entry.IsTrunc8Rcvr;
(AhRcvrRegisters)[Entry.Val] = Entry.IsAhRcvr; (AhRcvrRegisters)[Entry.Val] = Entry.IsAhRcvr;
(*ScratchRegs)[Entry.Val] = Entry.Scratch;
} }
(*TypeToRegisterSet)[RC_void] = InvalidRegisters; (*TypeToRegisterSet)[RC_void] = InvalidRegisters;
......
src/IceTargetLoweringX86Base.h
...@@ -902,7 +902,6 @@ protected: ...@@ -902,7 +902,6 @@ protected:
static std::array<llvm::SmallBitVector, RCX86_NUM> TypeToRegisterSet; static std::array<llvm::SmallBitVector, RCX86_NUM> TypeToRegisterSet;
static std::array<llvm::SmallBitVector, Traits::RegisterSet::Reg_NUM> static std::array<llvm::SmallBitVector, Traits::RegisterSet::Reg_NUM>
RegisterAliases; RegisterAliases;
static llvm::SmallBitVector ScratchRegs;
llvm::SmallBitVector RegsUsed; llvm::SmallBitVector RegsUsed;
std::array<VarList, IceType_NUM> PhysicalRegisters; std::array<VarList, IceType_NUM> PhysicalRegisters;
// GotVar is a Variable that holds the GlobalOffsetTable address for Non-SFI // GotVar is a Variable that holds the GlobalOffsetTable address for Non-SFI
......
src/IceTargetLoweringX86BaseImpl.h
...@@ -325,8 +325,8 @@ TargetX86Base<TraitsType>::TargetX86Base(Cfg *Func) ...@@ -325,8 +325,8 @@ TargetX86Base<TraitsType>::TargetX86Base(Cfg *Func)
template <typename TraitsType> template <typename TraitsType>
void TargetX86Base<TraitsType>::staticInit(GlobalContext *Ctx) { void TargetX86Base<TraitsType>::staticInit(GlobalContext *Ctx) {
Traits::initRegisterSet(Ctx->getFlags(), &TypeToRegisterSet, &RegisterAliases, Traits::initRegisterSet(Ctx->getFlags(), &TypeToRegisterSet,
&ScratchRegs); &RegisterAliases);
filterTypeToRegisterSet(Ctx, Traits::RegisterSet::Reg_NUM, filterTypeToRegisterSet(Ctx, Traits::RegisterSet::Reg_NUM,
TypeToRegisterSet.data(), TypeToRegisterSet.size(), TypeToRegisterSet.data(), TypeToRegisterSet.size(),
Traits::getRegName); Traits::getRegName);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment