Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45226 )
Change subject: arch,cpu: Get rid of is*Reg() methods in RegId.
......................................................................
arch,cpu: Get rid of is*Reg() methods in RegId.
These bake in the existing set of RegClass values and are not flexible
or scalable.
Change-Id: I107460cd82960d96916d1644403b7635820045a0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45226
Reviewed-by: Giacomo Travaglini <[email protected]>
Maintainer: Giacomo Travaglini <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/arm/insts/misc.cc
M src/arch/mips/isa/base.isa
M src/arch/power/insts/static_inst.cc
M src/arch/riscv/utility.hh
M src/arch/sparc/insts/static_inst.cc
M src/arch/x86/insts/static_inst.cc
M src/cpu/checker/cpu.hh
M src/cpu/minor/exec_context.hh
M src/cpu/o3/dyn_inst.hh
M src/cpu/o3/probe/elastic_trace.cc
M src/cpu/o3/regfile.cc
M src/cpu/o3/regfile.hh
M src/cpu/o3/rename_map.hh
M src/cpu/o3/scoreboard.hh
M src/cpu/reg_class.hh
M src/cpu/simple/exec_context.hh
16 files changed, 162 insertions(+), 194 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/insts/misc.cc b/src/arch/arm/insts/misc.cc
index f70b7a7..9c79f60 100644
--- a/src/arch/arm/insts/misc.cc
+++ b/src/arch/arm/insts/misc.cc
@@ -52,7 +52,7 @@
bool foundPsr = false;
for (unsigned i = 0; i < numSrcRegs(); i++) {
const RegId& reg = srcRegIdx(i);
- if (!reg.isMiscReg()) {
+ if (!reg.is(MiscRegClass)) {
continue;
}
if (reg.index() == MISCREG_CPSR) {
@@ -80,7 +80,7 @@
bool foundPsr = false;
for (unsigned i = 0; i < numDestRegs(); i++) {
const RegId& reg = destRegIdx(i);
- if (!reg.isMiscReg()) {
+ if (!reg.is(MiscRegClass)) {
continue;
}
if (reg.index() == MISCREG_CPSR) {
diff --git a/src/arch/mips/isa/base.isa b/src/arch/mips/isa/base.isa
index 45f873f..fa038a2 100644
--- a/src/arch/mips/isa/base.isa
+++ b/src/arch/mips/isa/base.isa
@@ -88,7 +88,7 @@
void
MipsStaticInst::printReg(std::ostream &os, RegId reg) const
{
- if (reg.isIntReg()) {
+ if (reg.is(IntRegClass)) {
ccprintf(os, "r%d", reg.index());
} else {
ccprintf(os, "f%d", reg.index());
diff --git a/src/arch/power/insts/static_inst.cc
b/src/arch/power/insts/static_inst.cc
index 97730b3..35cf286 100644
--- a/src/arch/power/insts/static_inst.cc
+++ b/src/arch/power/insts/static_inst.cc
@@ -36,11 +36,14 @@
void
PowerStaticInst::printReg(std::ostream &os, RegId reg) const
{
- if (reg.isIntReg())
+ switch (reg.classValue()) {
+ case IntRegClass:
ccprintf(os, "r%d", reg.index());
- else if (reg.isFloatReg())
+ break;
+ case FloatRegClass:
ccprintf(os, "f%d", reg.index());
- else if (reg.isMiscReg())
+ break;
+ case MiscRegClass:
switch (reg.index()) {
case 0: ccprintf(os, "cr"); break;
case 1: ccprintf(os, "xer"); break;
@@ -49,8 +52,10 @@
default: ccprintf(os, "unknown_reg");
break;
}
- else if (reg.isCCReg())
- panic("printReg: POWER does not implement CCRegClass\n");
+ break;
+ default:
+ panic("printReg: Unrecognized register class.");
+ }
}
std::string
diff --git a/src/arch/riscv/utility.hh b/src/arch/riscv/utility.hh
index 68a7421..bae341e 100644
--- a/src/arch/riscv/utility.hh
+++ b/src/arch/riscv/utility.hh
@@ -102,7 +102,7 @@
inline std::string
registerName(RegId reg)
{
- if (reg.isIntReg()) {
+ if (reg.is(IntRegClass)) {
if (reg.index() >= NumIntArchRegs) {
/*
* This should only happen if a instruction is being
speculatively
diff --git a/src/arch/sparc/insts/static_inst.cc
b/src/arch/sparc/insts/static_inst.cc
index 72e4c6b..6369152 100644
--- a/src/arch/sparc/insts/static_inst.cc
+++ b/src/arch/sparc/insts/static_inst.cc
@@ -104,7 +104,7 @@
const int MaxInput = 32;
const int MaxMicroReg = 40;
RegIndex reg_idx = reg.index();
- if (reg.isIntReg()) {
+ if (reg.is(IntRegClass)) {
// If we used a register from the next or previous window,
// take out the offset.
while (reg_idx >= MaxMicroReg)
@@ -149,7 +149,7 @@
break;
}
}
- } else if (reg.isFloatReg()) {
+ } else if (reg.is(FloatRegClass)) {
ccprintf(os, "%%f%d", reg_idx);
} else {
switch (reg_idx) {
diff --git a/src/arch/x86/insts/static_inst.cc
b/src/arch/x86/insts/static_inst.cc
index 67f7eec..6052c9b 100644
--- a/src/arch/x86/insts/static_inst.cc
+++ b/src/arch/x86/insts/static_inst.cc
@@ -150,71 +150,74 @@
RegIndex reg_idx = reg.index();
- if (reg.isIntReg()) {
- const char * suffix = "";
- bool fold = reg_idx & IntFoldBit;
- reg_idx &= ~IntFoldBit;
+ switch (reg.classValue()) {
+ case IntRegClass:
+ {
+ const char * suffix = "";
+ bool fold = reg_idx & IntFoldBit;
+ reg_idx &= ~IntFoldBit;
- if (fold)
- suffix = "h";
- else if (reg_idx < 8 && size == 1)
- suffix = "l";
+ if (fold)
+ suffix = "h";
+ else if (reg_idx < 8 && size == 1)
+ suffix = "l";
- switch (reg_idx) {
- case INTREG_RAX:
- ccprintf(os, abcdFormats[size], "a");
- break;
- case INTREG_RBX:
- ccprintf(os, abcdFormats[size], "b");
- break;
- case INTREG_RCX:
- ccprintf(os, abcdFormats[size], "c");
- break;
- case INTREG_RDX:
- ccprintf(os, abcdFormats[size], "d");
- break;
- case INTREG_RSP:
- ccprintf(os, piFormats[size], "sp");
- break;
- case INTREG_RBP:
- ccprintf(os, piFormats[size], "bp");
- break;
- case INTREG_RSI:
- ccprintf(os, piFormats[size], "si");
- break;
- case INTREG_RDI:
- ccprintf(os, piFormats[size], "di");
- break;
- case INTREG_R8W:
- ccprintf(os, longFormats[size], "8");
- break;
- case INTREG_R9W:
- ccprintf(os, longFormats[size], "9");
- break;
- case INTREG_R10W:
- ccprintf(os, longFormats[size], "10");
- break;
- case INTREG_R11W:
- ccprintf(os, longFormats[size], "11");
- break;
- case INTREG_R12W:
- ccprintf(os, longFormats[size], "12");
- break;
- case INTREG_R13W:
- ccprintf(os, longFormats[size], "13");
- break;
- case INTREG_R14W:
- ccprintf(os, longFormats[size], "14");
- break;
- case INTREG_R15W:
- ccprintf(os, longFormats[size], "15");
- break;
- default:
- ccprintf(os, microFormats[size], reg_idx - NUM_INTREGS);
+ switch (reg_idx) {
+ case INTREG_RAX:
+ ccprintf(os, abcdFormats[size], "a");
+ break;
+ case INTREG_RBX:
+ ccprintf(os, abcdFormats[size], "b");
+ break;
+ case INTREG_RCX:
+ ccprintf(os, abcdFormats[size], "c");
+ break;
+ case INTREG_RDX:
+ ccprintf(os, abcdFormats[size], "d");
+ break;
+ case INTREG_RSP:
+ ccprintf(os, piFormats[size], "sp");
+ break;
+ case INTREG_RBP:
+ ccprintf(os, piFormats[size], "bp");
+ break;
+ case INTREG_RSI:
+ ccprintf(os, piFormats[size], "si");
+ break;
+ case INTREG_RDI:
+ ccprintf(os, piFormats[size], "di");
+ break;
+ case INTREG_R8W:
+ ccprintf(os, longFormats[size], "8");
+ break;
+ case INTREG_R9W:
+ ccprintf(os, longFormats[size], "9");
+ break;
+ case INTREG_R10W:
+ ccprintf(os, longFormats[size], "10");
+ break;
+ case INTREG_R11W:
+ ccprintf(os, longFormats[size], "11");
+ break;
+ case INTREG_R12W:
+ ccprintf(os, longFormats[size], "12");
+ break;
+ case INTREG_R13W:
+ ccprintf(os, longFormats[size], "13");
+ break;
+ case INTREG_R14W:
+ ccprintf(os, longFormats[size], "14");
+ break;
+ case INTREG_R15W:
+ ccprintf(os, longFormats[size], "15");
+ break;
+ default:
+ ccprintf(os, microFormats[size], reg_idx - NUM_INTREGS);
+ }
+ ccprintf(os, suffix);
}
- ccprintf(os, suffix);
-
- } else if (reg.isFloatReg()) {
+ break;
+ case FloatRegClass:
if (reg_idx < NumMMXRegs) {
ccprintf(os, "%%mmx%d", reg_idx);
return;
@@ -232,15 +235,18 @@
}
reg_idx -= NumMicroFpRegs;
ccprintf(os, "%%st(%d)", reg_idx);
-
- } else if (reg.isCCReg()) {
+ break;
+ case CCRegClass:
ccprintf(os, "%%cc%d", reg_idx);
-
- } else if (reg.isMiscReg()) {
+ break;
+ case MiscRegClass:
switch (reg_idx) {
default:
ccprintf(os, "%%ctrl%d", reg_idx);
}
+ break;
+ default:
+ panic("Unrecognized register class.");
}
}
diff --git a/src/cpu/checker/cpu.hh b/src/cpu/checker/cpu.hh
index 04e1082..a13eec7 100644
--- a/src/cpu/checker/cpu.hh
+++ b/src/cpu/checker/cpu.hh
@@ -182,7 +182,7 @@
readIntRegOperand(const StaticInst *si, int idx) override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isIntReg());
+ assert(reg.is(IntRegClass));
return thread->readIntReg(reg.index());
}
@@ -190,7 +190,7 @@
readFloatRegOperandBits(const StaticInst *si, int idx) override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isFloatReg());
+ assert(reg.is(FloatRegClass));
return thread->readFloatReg(reg.index());
}
@@ -201,7 +201,7 @@
readVecRegOperand(const StaticInst *si, int idx) const override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isVecReg());
+ assert(reg.is(VecRegClass));
return thread->readVecReg(reg);
}
@@ -212,7 +212,7 @@
getWritableVecRegOperand(const StaticInst *si, int idx) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecReg());
+ assert(reg.is(VecRegClass));
return thread->getWritableVecReg(reg);
}
@@ -227,7 +227,7 @@
readVecPredRegOperand(const StaticInst *si, int idx) const override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isVecPredReg());
+ assert(reg.is(VecPredRegClass));
return thread->readVecPredReg(reg);
}
@@ -235,7 +235,7 @@
getWritableVecPredRegOperand(const StaticInst *si, int idx) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecPredReg());
+ assert(reg.is(VecPredRegClass));
return thread->getWritableVecPredReg(reg);
}
@@ -243,7 +243,7 @@
readCCRegOperand(const StaticInst *si, int idx) override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isCCReg());
+ assert(reg.is(CCRegClass));
return thread->readCCReg(reg.index());
}
@@ -283,7 +283,7 @@
setIntRegOperand(const StaticInst *si, int idx, RegVal val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isIntReg());
+ assert(reg.is(IntRegClass));
thread->setIntReg(reg.index(), val);
setScalarResult(val);
}
@@ -292,7 +292,7 @@
setFloatRegOperandBits(const StaticInst *si, int idx, RegVal val)
override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isFloatReg());
+ assert(reg.is(FloatRegClass));
thread->setFloatReg(reg.index(), val);
setScalarResult(val);
}
@@ -301,7 +301,7 @@
setCCRegOperand(const StaticInst *si, int idx, RegVal val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isCCReg());
+ assert(reg.is(CCRegClass));
thread->setCCReg(reg.index(), val);
setScalarResult((uint64_t)val);
}
@@ -311,7 +311,7 @@
const TheISA::VecRegContainer& val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecReg());
+ assert(reg.is(VecRegClass));
thread->setVecReg(reg, val);
setVecResult(val);
}
@@ -321,7 +321,7 @@
const TheISA::VecElem val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecElem());
+ assert(reg.is(VecElemClass));
thread->setVecElem(reg, val);
setVecElemResult(val);
}
@@ -330,7 +330,7 @@
const TheISA::VecPredRegContainer& val)
override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecPredReg());
+ assert(reg.is(VecPredRegClass));
thread->setVecPredReg(reg, val);
setVecPredResult(val);
}
@@ -437,7 +437,7 @@
readMiscRegOperand(const StaticInst *si, int idx) override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isMiscReg());
+ assert(reg.is(MiscRegClass));
return thread->readMiscReg(reg.index());
}
@@ -445,7 +445,7 @@
setMiscRegOperand(const StaticInst *si, int idx, RegVal val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isMiscReg());
+ assert(reg.is(MiscRegClass));
return this->setMiscReg(reg.index(), val);
}
diff --git a/src/cpu/minor/exec_context.hh b/src/cpu/minor/exec_context.hh
index 5630b4b..c6cfc90 100644
--- a/src/cpu/minor/exec_context.hh
+++ b/src/cpu/minor/exec_context.hh
@@ -144,7 +144,7 @@
readIntRegOperand(const StaticInst *si, int idx) override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isIntReg());
+ assert(reg.is(IntRegClass));
return thread.readIntReg(reg.index());
}
@@ -152,7 +152,7 @@
readFloatRegOperandBits(const StaticInst *si, int idx) override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isFloatReg());
+ assert(reg.is(FloatRegClass));
return thread.readFloatReg(reg.index());
}
@@ -160,7 +160,7 @@
readVecRegOperand(const StaticInst *si, int idx) const override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isVecReg());
+ assert(reg.is(VecRegClass));
return thread.readVecReg(reg);
}
@@ -168,7 +168,7 @@
getWritableVecRegOperand(const StaticInst *si, int idx) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecReg());
+ assert(reg.is(VecRegClass));
return thread.getWritableVecReg(reg);
}
@@ -176,7 +176,7 @@
readVecElemOperand(const StaticInst *si, int idx) const override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isVecElem());
+ assert(reg.is(VecElemClass));
return thread.readVecElem(reg);
}
@@ -184,7 +184,7 @@
readVecPredRegOperand(const StaticInst *si, int idx) const override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isVecPredReg());
+ assert(reg.is(VecPredRegClass));
return thread.readVecPredReg(reg);
}
@@ -192,7 +192,7 @@
getWritableVecPredRegOperand(const StaticInst *si, int idx) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecPredReg());
+ assert(reg.is(VecPredRegClass));
return thread.getWritableVecPredReg(reg);
}
@@ -200,7 +200,7 @@
setIntRegOperand(const StaticInst *si, int idx, RegVal val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isIntReg());
+ assert(reg.is(IntRegClass));
thread.setIntReg(reg.index(), val);
}
@@ -208,7 +208,7 @@
setFloatRegOperandBits(const StaticInst *si, int idx, RegVal val)
override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isFloatReg());
+ assert(reg.is(FloatRegClass));
thread.setFloatReg(reg.index(), val);
}
@@ -217,7 +217,7 @@
const TheISA::VecRegContainer& val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecReg());
+ assert(reg.is(VecRegClass));
thread.setVecReg(reg, val);
}
@@ -226,7 +226,7 @@
const TheISA::VecPredRegContainer& val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecPredReg());
+ assert(reg.is(VecPredRegClass));
thread.setVecPredReg(reg, val);
}
@@ -235,7 +235,7 @@
const TheISA::VecElem val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecElem());
+ assert(reg.is(VecElemClass));
thread.setVecElem(reg, val);
}
@@ -330,7 +330,7 @@
readMiscRegOperand(const StaticInst *si, int idx) override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isMiscReg());
+ assert(reg.is(MiscRegClass));
return thread.readMiscReg(reg.index());
}
@@ -338,7 +338,7 @@
setMiscRegOperand(const StaticInst *si, int idx, RegVal val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isMiscReg());
+ assert(reg.is(MiscRegClass));
return thread.setMiscReg(reg.index(), val);
}
@@ -362,7 +362,7 @@
readCCRegOperand(const StaticInst *si, int idx) override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isCCReg());
+ assert(reg.is(CCRegClass));
return thread.readCCReg(reg.index());
}
@@ -370,7 +370,7 @@
setCCRegOperand(const StaticInst *si, int idx, RegVal val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isCCReg());
+ assert(reg.is(CCRegClass));
thread.setCCReg(reg.index(), val);
}
diff --git a/src/cpu/o3/dyn_inst.hh b/src/cpu/o3/dyn_inst.hh
index f370f38..0e9ad5d 100644
--- a/src/cpu/o3/dyn_inst.hh
+++ b/src/cpu/o3/dyn_inst.hh
@@ -1137,7 +1137,7 @@
readMiscRegOperand(const StaticInst *si, int idx) override
{
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isMiscReg());
+ assert(reg.is(MiscRegClass));
return this->cpu->readMiscReg(reg.index(), this->threadNumber);
}
@@ -1148,7 +1148,7 @@
setMiscRegOperand(const StaticInst *si, int idx, RegVal val) override
{
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isMiscReg());
+ assert(reg.is(MiscRegClass));
setMiscReg(reg.index(), val);
}
diff --git a/src/cpu/o3/probe/elastic_trace.cc
b/src/cpu/o3/probe/elastic_trace.cc
index d7b07fe..f7a4159 100644
--- a/src/cpu/o3/probe/elastic_trace.cc
+++ b/src/cpu/o3/probe/elastic_trace.cc
@@ -244,8 +244,8 @@
for (int src_idx = 0; src_idx < max_regs; src_idx++) {
const RegId& src_reg = dyn_inst->srcRegIdx(src_idx);
- if (!src_reg.isMiscReg() &&
- !(src_reg.isIntReg() && src_reg.index() == zeroReg)) {
+ if (!src_reg.is(MiscRegClass) &&
+ !(src_reg.is(IntRegClass) && src_reg.index() == zeroReg)) {
// Get the physical register index of the i'th source register.
PhysRegIdPtr phys_src_reg =
dyn_inst->regs.renamedSrcIdx(src_idx);
DPRINTFR(ElasticTrace, "[sn:%lli] Check map for src reg"
@@ -276,8 +276,8 @@
// For data dependency tracking the register must be an int, float
or
// CC register and not a Misc register.
const RegId& dest_reg = dyn_inst->destRegIdx(dest_idx);
- if (!dest_reg.isMiscReg() &&
- !(dest_reg.isIntReg() && dest_reg.index() == zeroReg)) {
+ if (!dest_reg.is(MiscRegClass) &&
+ !(dest_reg.is(IntRegClass) && dest_reg.index() ==
zeroReg)) {
// Get the physical register index of the i'th destination
// register.
PhysRegIdPtr phys_dest_reg =
diff --git a/src/cpu/o3/regfile.cc b/src/cpu/o3/regfile.cc
index bfdb621..8871b48 100644
--- a/src/cpu/o3/regfile.cc
+++ b/src/cpu/o3/regfile.cc
@@ -182,7 +182,7 @@
PhysRegFile::IdRange
PhysRegFile::getRegElemIds(PhysRegIdPtr reg)
{
- panic_if(!reg->isVectorPhysReg(),
+ panic_if(!reg->is(VecRegClass),
"Trying to get elems of a %s register", reg->className());
auto idx = reg->index();
return std::make_pair(
@@ -225,7 +225,7 @@
return &vecElemIds[reg->index() * TheISA::NumVecElemPerVecReg +
reg->elemIndex()];
default:
- panic_if(!reg->isVectorPhysElem(),
+ panic_if(!reg->is(VecElemClass),
"Trying to get the register of a %s register",
reg->className());
}
return nullptr;
diff --git a/src/cpu/o3/regfile.hh b/src/cpu/o3/regfile.hh
index bdde7d6..fca0959 100644
--- a/src/cpu/o3/regfile.hh
+++ b/src/cpu/o3/regfile.hh
@@ -178,7 +178,7 @@
RegVal
readIntReg(PhysRegIdPtr phys_reg) const
{
- assert(phys_reg->isIntPhysReg());
+ assert(phys_reg->is(IntRegClass));
DPRINTF(IEW, "RegFile: Access to int register %i, has data "
"%#x\n", phys_reg->index(), intRegFile[phys_reg->index()]);
@@ -188,7 +188,7 @@
RegVal
readFloatReg(PhysRegIdPtr phys_reg) const
{
- assert(phys_reg->isFloatPhysReg());
+ assert(phys_reg->is(FloatRegClass));
RegVal floatRegBits = floatRegFile[phys_reg->index()];
@@ -202,7 +202,7 @@
const TheISA::VecRegContainer &
readVecReg(PhysRegIdPtr phys_reg) const
{
- assert(phys_reg->isVectorPhysReg());
+ assert(phys_reg->is(VecRegClass));
DPRINTF(IEW, "RegFile: Access to vector register %i, has "
"data %s\n", int(phys_reg->index()),
@@ -223,7 +223,7 @@
const TheISA::VecElem &
readVecElem(PhysRegIdPtr phys_reg) const
{
- assert(phys_reg->isVectorPhysElem());
+ assert(phys_reg->is(VecElemClass));
auto ret = vectorRegFile[phys_reg->index()].as<TheISA::VecElem>();
const TheISA::VecElem& val = ret[phys_reg->elemIndex()];
DPRINTF(IEW, "RegFile: Access to element %d of vector register %i,"
@@ -237,7 +237,7 @@
const TheISA::VecPredRegContainer&
readVecPredReg(PhysRegIdPtr phys_reg) const
{
- assert(phys_reg->isVecPredPhysReg());
+ assert(phys_reg->is(VecPredRegClass));
DPRINTF(IEW, "RegFile: Access to predicate register %i, has "
"data %s\n", int(phys_reg->index()),
@@ -258,7 +258,7 @@
RegVal
readCCReg(PhysRegIdPtr phys_reg)
{
- assert(phys_reg->isCCPhysReg());
+ assert(phys_reg->is(CCRegClass));
DPRINTF(IEW, "RegFile: Access to cc register %i, has "
"data %#x\n", phys_reg->index(),
@@ -271,7 +271,7 @@
void
setIntReg(PhysRegIdPtr phys_reg, RegVal val)
{
- assert(phys_reg->isIntPhysReg());
+ assert(phys_reg->is(IntRegClass));
DPRINTF(IEW, "RegFile: Setting int register %i to %#x\n",
phys_reg->index(), val);
@@ -283,7 +283,7 @@
void
setFloatReg(PhysRegIdPtr phys_reg, RegVal val)
{
- assert(phys_reg->isFloatPhysReg());
+ assert(phys_reg->is(FloatRegClass));
DPRINTF(IEW, "RegFile: Setting float register %i to %#x\n",
phys_reg->index(), (uint64_t)val);
@@ -295,7 +295,7 @@
void
setVecReg(PhysRegIdPtr phys_reg, const TheISA::VecRegContainer& val)
{
- assert(phys_reg->isVectorPhysReg());
+ assert(phys_reg->is(VecRegClass));
DPRINTF(IEW, "RegFile: Setting vector register %i to %s\n",
int(phys_reg->index()), val);
@@ -307,7 +307,7 @@
void
setVecElem(PhysRegIdPtr phys_reg, const TheISA::VecElem val)
{
- assert(phys_reg->isVectorPhysElem());
+ assert(phys_reg->is(VecElemClass));
DPRINTF(IEW, "RegFile: Setting element %d of vector register %i to"
" %#x\n", phys_reg->elemIndex(), int(phys_reg->index()),
val);
@@ -321,7 +321,7 @@
setVecPredReg(PhysRegIdPtr phys_reg,
const TheISA::VecPredRegContainer& val)
{
- assert(phys_reg->isVecPredPhysReg());
+ assert(phys_reg->is(VecPredRegClass));
DPRINTF(IEW, "RegFile: Setting predicate register %i to %s\n",
int(phys_reg->index()), val);
@@ -333,7 +333,7 @@
void
setCCReg(PhysRegIdPtr phys_reg, RegVal val)
{
- assert(phys_reg->isCCPhysReg());
+ assert(phys_reg->is(CCRegClass));
DPRINTF(IEW, "RegFile: Setting cc register %i to %#x\n",
phys_reg->index(), (uint64_t)val);
diff --git a/src/cpu/o3/rename_map.hh b/src/cpu/o3/rename_map.hh
index 4d3c919..78823b2 100644
--- a/src/cpu/o3/rename_map.hh
+++ b/src/cpu/o3/rename_map.hh
@@ -304,31 +304,26 @@
void
setEntry(const RegId& arch_reg, PhysRegIdPtr phys_reg)
{
+ assert(phys_reg->is(arch_reg.classValue()));
switch (arch_reg.classValue()) {
case IntRegClass:
- assert(phys_reg->isIntPhysReg());
return intMap.setEntry(arch_reg, phys_reg);
case FloatRegClass:
- assert(phys_reg->isFloatPhysReg());
return floatMap.setEntry(arch_reg, phys_reg);
case VecRegClass:
- assert(phys_reg->isVectorPhysReg());
assert(vecMode == Enums::Full);
return vecMap.setEntry(arch_reg, phys_reg);
case VecElemClass:
- assert(phys_reg->isVectorPhysElem());
assert(vecMode == Enums::Elem);
return vecElemMap.setEntry(arch_reg, phys_reg);
case VecPredRegClass:
- assert(phys_reg->isVecPredPhysReg());
return predMap.setEntry(arch_reg, phys_reg);
case CCRegClass:
- assert(phys_reg->isCCPhysReg());
return ccMap.setEntry(arch_reg, phys_reg);
case MiscRegClass:
diff --git a/src/cpu/o3/scoreboard.hh b/src/cpu/o3/scoreboard.hh
index 74825f9..239497a 100644
--- a/src/cpu/o3/scoreboard.hh
+++ b/src/cpu/o3/scoreboard.hh
@@ -87,7 +87,7 @@
bool ready = regScoreBoard[phys_reg->flatIndex()];
- if (phys_reg->isIntPhysReg() && phys_reg->index() == zeroReg)
+ if (phys_reg->is(IntRegClass) && phys_reg->index() == zeroReg)
assert(ready);
return ready;
@@ -124,7 +124,7 @@
}
// zero reg should never be marked unready
- if (phys_reg->isIntPhysReg() && phys_reg->index() == zeroReg)
+ if (phys_reg->is(IntRegClass) && phys_reg->index() == zeroReg)
return;
regScoreBoard[phys_reg->flatIndex()] = false;
diff --git a/src/cpu/reg_class.hh b/src/cpu/reg_class.hh
index fa8e2a1..2f63865 100644
--- a/src/cpu/reg_class.hh
+++ b/src/cpu/reg_class.hh
@@ -149,26 +149,8 @@
return regClass != MiscRegClass;
}
- /** @return true if it is an integer physical register. */
- bool isIntReg() const { return regClass == IntRegClass; }
-
- /** @return true if it is a floating-point physical register. */
- bool isFloatReg() const { return regClass == FloatRegClass; }
-
- /** @Return true if it is a condition-code physical register. */
- bool isVecReg() const { return regClass == VecRegClass; }
-
- /** @Return true if it is a condition-code physical register. */
- bool isVecElem() const { return regClass == VecElemClass; }
-
- /** @Return true if it is a predicate physical register. */
- bool isVecPredReg() const { return regClass == VecPredRegClass; }
-
- /** @Return true if it is a condition-code physical register. */
- bool isCCReg() const { return regClass == CCRegClass; }
-
- /** @Return true if it is a condition-code physical register. */
- bool isMiscReg() const { return regClass == MiscRegClass; }
+ /** @return true if it is of the specified class. */
+ bool is(RegClass reg_class) const { return regClass == reg_class; }
/** Index accessors */
/** @{ */
@@ -254,6 +236,7 @@
using RegId::classValue;
using RegId::className;
using RegId::elemIndex;
+ using RegId::is;
/** @} */
/**
* Explicit forward methods, to prevent comparisons of PhysRegId with
@@ -279,27 +262,6 @@
}
/** @} */
- /** @return true if it is an integer physical register. */
- bool isIntPhysReg() const { return isIntReg(); }
-
- /** @return true if it is a floating-point physical register. */
- bool isFloatPhysReg() const { return isFloatReg(); }
-
- /** @Return true if it is a condition-code physical register. */
- bool isCCPhysReg() const { return isCCReg(); }
-
- /** @Return true if it is a vector physical register. */
- bool isVectorPhysReg() const { return isVecReg(); }
-
- /** @Return true if it is a vector element physical register. */
- bool isVectorPhysElem() const { return isVecElem(); }
-
- /** @return true if it is a vector predicate physical register. */
- bool isVecPredPhysReg() const { return isVecPredReg(); }
-
- /** @Return true if it is a condition-code physical register. */
- bool isMiscPhysReg() const { return isMiscReg(); }
-
/**
* Returns true if this register is always associated to the same
* architectural register.
@@ -312,7 +274,7 @@
static PhysRegId
elemId(PhysRegId* vid, ElemIndex elem)
{
- assert(vid->isVectorPhysReg());
+ assert(vid->is(VecRegClass));
return PhysRegId(VecElemClass, vid->index(), elem);
}
diff --git a/src/cpu/simple/exec_context.hh b/src/cpu/simple/exec_context.hh
index 114ab90..8bcf810 100644
--- a/src/cpu/simple/exec_context.hh
+++ b/src/cpu/simple/exec_context.hh
@@ -277,7 +277,7 @@
{
execContextStats.numIntRegReads++;
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isIntReg());
+ assert(reg.is(IntRegClass));
return thread->readIntReg(reg.index());
}
@@ -287,7 +287,7 @@
{
execContextStats.numIntRegWrites++;
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isIntReg());
+ assert(reg.is(IntRegClass));
thread->setIntReg(reg.index(), val);
}
@@ -298,7 +298,7 @@
{
execContextStats.numFpRegReads++;
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isFloatReg());
+ assert(reg.is(FloatRegClass));
return thread->readFloatReg(reg.index());
}
@@ -309,7 +309,7 @@
{
execContextStats.numFpRegWrites++;
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isFloatReg());
+ assert(reg.is(FloatRegClass));
thread->setFloatReg(reg.index(), val);
}
@@ -319,7 +319,7 @@
{
execContextStats.numVecRegReads++;
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isVecReg());
+ assert(reg.is(VecRegClass));
return thread->readVecReg(reg);
}
@@ -329,7 +329,7 @@
{
execContextStats.numVecRegWrites++;
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecReg());
+ assert(reg.is(VecRegClass));
return thread->getWritableVecReg(reg);
}
@@ -340,7 +340,7 @@
{
execContextStats.numVecRegWrites++;
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecReg());
+ assert(reg.is(VecRegClass));
thread->setVecReg(reg, val);
}
@@ -350,7 +350,7 @@
{
execContextStats.numVecRegReads++;
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isVecElem());
+ assert(reg.is(VecElemClass));
return thread->readVecElem(reg);
}
@@ -361,7 +361,7 @@
{
execContextStats.numVecRegWrites++;
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecElem());
+ assert(reg.is(VecElemClass));
thread->setVecElem(reg, val);
}
@@ -370,7 +370,7 @@
{
execContextStats.numVecPredRegReads++;
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isVecPredReg());
+ assert(reg.is(VecPredRegClass));
return thread->readVecPredReg(reg);
}
@@ -379,7 +379,7 @@
{
execContextStats.numVecPredRegWrites++;
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecPredReg());
+ assert(reg.is(VecPredRegClass));
return thread->getWritableVecPredReg(reg);
}
@@ -389,7 +389,7 @@
{
execContextStats.numVecPredRegWrites++;
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isVecPredReg());
+ assert(reg.is(VecPredRegClass));
thread->setVecPredReg(reg, val);
}
@@ -398,7 +398,7 @@
{
execContextStats.numCCRegReads++;
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isCCReg());
+ assert(reg.is(CCRegClass));
return thread->readCCReg(reg.index());
}
@@ -407,7 +407,7 @@
{
execContextStats.numCCRegWrites++;
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isCCReg());
+ assert(reg.is(CCRegClass));
thread->setCCReg(reg.index(), val);
}
@@ -416,7 +416,7 @@
{
execContextStats.numIntRegReads++;
const RegId& reg = si->srcRegIdx(idx);
- assert(reg.isMiscReg());
+ assert(reg.is(MiscRegClass));
return thread->readMiscReg(reg.index());
}
@@ -425,7 +425,7 @@
{
execContextStats.numIntRegWrites++;
const RegId& reg = si->destRegIdx(idx);
- assert(reg.isMiscReg());
+ assert(reg.is(MiscRegClass));
thread->setMiscReg(reg.index(), val);
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45226
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I107460cd82960d96916d1644403b7635820045a0
Gerrit-Change-Number: 45226
Gerrit-PatchSet: 5
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s