Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/52484 )
Change subject: cpu-o3: Remove unnecessary this->s from DynInst and
SimpleFreeList.
......................................................................
cpu-o3: Remove unnecessary this->s from DynInst and SimpleFreeList.
These were left over from when these were template classes.
Change-Id: I102d2016fbba0ca09f16e10d8741ae0e2f967681
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52484
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/cpu/o3/free_list.hh
M src/cpu/o3/dyn_inst.cc
M src/cpu/o3/dyn_inst.hh
3 files changed, 86 insertions(+), 72 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/o3/dyn_inst.cc b/src/cpu/o3/dyn_inst.cc
index edbaa04..37db1ed 100644
--- a/src/cpu/o3/dyn_inst.cc
+++ b/src/cpu/o3/dyn_inst.cc
@@ -59,7 +59,7 @@
regs(staticInst->numSrcRegs(), staticInst->numDestRegs()),
predPC(pred_pc), macroop(_macroop)
{
- this->regs.init();
+ regs.init();
status.reset();
@@ -99,7 +99,7 @@
{
#if TRACING_ON
if (debug::O3PipeView) {
- Tick fetch = this->fetchTick;
+ Tick fetch = fetchTick;
// fetchTick can be -1 if the instruction fetched outside the trace
// window.
if (fetch != -1) {
@@ -107,24 +107,24 @@
// Print info needed by the pipeline activity viewer.
DPRINTFR(O3PipeView, "O3PipeView:fetch:%llu:0x%08llx:%d:%llu:%s\n",
fetch,
- this->instAddr(),
- this->microPC(),
- this->seqNum,
- this->staticInst->disassemble(this->instAddr()));
+ instAddr(),
+ microPC(),
+ seqNum,
+ staticInst->disassemble(instAddr()));
- val = (this->decodeTick == -1) ? 0 : fetch + this->decodeTick;
+ val = (decodeTick == -1) ? 0 : fetch + decodeTick;
DPRINTFR(O3PipeView, "O3PipeView:decode:%llu\n", val);
- val = (this->renameTick == -1) ? 0 : fetch + this->renameTick;
+ val = (renameTick == -1) ? 0 : fetch + renameTick;
DPRINTFR(O3PipeView, "O3PipeView:rename:%llu\n", val);
- val = (this->dispatchTick == -1) ? 0 : fetch +
this->dispatchTick;
+ val = (dispatchTick == -1) ? 0 : fetch + dispatchTick;
DPRINTFR(O3PipeView, "O3PipeView:dispatch:%llu\n", val);
- val = (this->issueTick == -1) ? 0 : fetch + this->issueTick;
+ val = (issueTick == -1) ? 0 : fetch + issueTick;
DPRINTFR(O3PipeView, "O3PipeView:issue:%llu\n", val);
- val = (this->completeTick == -1) ? 0 : fetch +
this->completeTick;
+ val = (completeTick == -1) ? 0 : fetch + completeTick;
DPRINTFR(O3PipeView, "O3PipeView:complete:%llu\n", val);
- val = (this->commitTick == -1) ? 0 : fetch + this->commitTick;
+ val = (commitTick == -1) ? 0 : fetch + commitTick;
- Tick valS = (this->storeTick == -1) ? 0 : fetch +
this->storeTick;
+ Tick valS = (storeTick == -1) ? 0 : fetch + storeTick;
DPRINTFR(O3PipeView, "O3PipeView:retire:%llu:store:%llu\n",
val, valS);
}
@@ -231,14 +231,14 @@
// when using the TC during an instruction's execution
// (specifically for instructions that have side-effects that use
// the TC). Fix this.
- bool no_squash_from_TC = this->thread->noSquashFromTC;
- this->thread->noSquashFromTC = true;
+ bool no_squash_from_TC = thread->noSquashFromTC;
+ thread->noSquashFromTC = true;
- this->fault = this->staticInst->execute(this, this->traceData);
+ fault = staticInst->execute(this, traceData);
- this->thread->noSquashFromTC = no_squash_from_TC;
+ thread->noSquashFromTC = no_squash_from_TC;
- return this->fault;
+ return fault;
}
Fault
@@ -248,14 +248,14 @@
// when using the TC during an instruction's execution
// (specifically for instructions that have side-effects that use
// the TC). Fix this.
- bool no_squash_from_TC = this->thread->noSquashFromTC;
- this->thread->noSquashFromTC = true;
+ bool no_squash_from_TC = thread->noSquashFromTC;
+ thread->noSquashFromTC = true;
- this->fault = this->staticInst->initiateAcc(this, this->traceData);
+ fault = staticInst->initiateAcc(this, traceData);
- this->thread->noSquashFromTC = no_squash_from_TC;
+ thread->noSquashFromTC = no_squash_from_TC;
- return this->fault;
+ return fault;
}
Fault
@@ -265,26 +265,26 @@
// when using the TC during an instruction's execution
// (specifically for instructions that have side-effects that use
// the TC). Fix this.
- bool no_squash_from_TC = this->thread->noSquashFromTC;
- this->thread->noSquashFromTC = true;
+ bool no_squash_from_TC = thread->noSquashFromTC;
+ thread->noSquashFromTC = true;
- if (this->cpu->checker) {
- if (this->isStoreConditional()) {
- this->reqToVerify->setExtraData(pkt->req->getExtraData());
+ if (cpu->checker) {
+ if (isStoreConditional()) {
+ reqToVerify->setExtraData(pkt->req->getExtraData());
}
}
- this->fault = this->staticInst->completeAcc(pkt, this,
this->traceData);
+ fault = staticInst->completeAcc(pkt, this, traceData);
- this->thread->noSquashFromTC = no_squash_from_TC;
+ thread->noSquashFromTC = no_squash_from_TC;
- return this->fault;
+ return fault;
}
void
DynInst::trap(const Fault &fault)
{
- this->cpu->trap(fault, this->threadNumber, this->staticInst);
+ cpu->trap(fault, threadNumber, staticInst);
}
Fault
diff --git a/src/cpu/o3/dyn_inst.hh b/src/cpu/o3/dyn_inst.hh
index 45d7b12..0692ded 100644
--- a/src/cpu/o3/dyn_inst.hh
+++ b/src/cpu/o3/dyn_inst.hh
@@ -638,7 +638,7 @@
getHtmTransactionUid() const override
{
assert(instFlags[HtmFromTransaction]);
- return this->htmUid;
+ return htmUid;
}
uint64_t
@@ -658,7 +658,7 @@
getHtmTransactionalDepth() const override
{
if (inHtmTransactionalState())
- return this->htmDepth;
+ return htmDepth;
else
return 0;
}
@@ -1072,7 +1072,7 @@
RegVal
readMiscReg(int misc_reg) override
{
- return this->cpu->readMiscReg(misc_reg, this->threadNumber);
+ return cpu->readMiscReg(misc_reg, threadNumber);
}
/** Sets a misc. register, including any side-effects the write
@@ -1104,7 +1104,7 @@
{
const RegId& reg = si->srcRegIdx(idx);
assert(reg.is(MiscRegClass));
- return this->cpu->readMiscReg(reg.index(), this->threadNumber);
+ return cpu->readMiscReg(reg.index(), threadNumber);
}
/** Sets a misc. register, including any side-effects the write
@@ -1126,47 +1126,47 @@
// using the TC during an instruction's execution (specifically for
// instructions that have side-effects that use the TC). Fix this.
// See cpu/o3/dyn_inst_impl.hh.
- bool no_squash_from_TC = this->thread->noSquashFromTC;
- this->thread->noSquashFromTC = true;
+ bool no_squash_from_TC = thread->noSquashFromTC;
+ thread->noSquashFromTC = true;
for (int i = 0; i < _destMiscRegIdx.size(); i++)
- this->cpu->setMiscReg(
- _destMiscRegIdx[i], _destMiscRegVal[i],
this->threadNumber);
+ cpu->setMiscReg(
+ _destMiscRegIdx[i], _destMiscRegVal[i], threadNumber);
- this->thread->noSquashFromTC = no_squash_from_TC;
+ thread->noSquashFromTC = no_squash_from_TC;
}
void
forwardOldRegs()
{
- for (int idx = 0; idx < this->numDestRegs(); idx++) {
- PhysRegIdPtr prev_phys_reg = this->regs.prevDestIdx(idx);
- const RegId& original_dest_reg =
this->staticInst->destRegIdx(idx);
+ for (int idx = 0; idx < numDestRegs(); idx++) {
+ PhysRegIdPtr prev_phys_reg = regs.prevDestIdx(idx);
+ const RegId& original_dest_reg = staticInst->destRegIdx(idx);
switch (original_dest_reg.classValue()) {
case IntRegClass:
- this->setIntRegOperand(this->staticInst.get(), idx,
- this->cpu->readIntReg(prev_phys_reg));
+ setIntRegOperand(staticInst.get(), idx,
+ cpu->readIntReg(prev_phys_reg));
break;
case FloatRegClass:
- this->setFloatRegOperandBits(this->staticInst.get(), idx,
- this->cpu->readFloatReg(prev_phys_reg));
+ setFloatRegOperandBits(staticInst.get(), idx,
+ cpu->readFloatReg(prev_phys_reg));
break;
case VecRegClass:
- this->setVecRegOperand(this->staticInst.get(), idx,
- this->cpu->readVecReg(prev_phys_reg));
+ setVecRegOperand(staticInst.get(), idx,
+ cpu->readVecReg(prev_phys_reg));
break;
case VecElemClass:
- this->setVecElemOperand(this->staticInst.get(), idx,
- this->cpu->readVecElem(prev_phys_reg));
+ setVecElemOperand(staticInst.get(), idx,
+ cpu->readVecElem(prev_phys_reg));
break;
case VecPredRegClass:
- this->setVecPredRegOperand(this->staticInst.get(), idx,
- this->cpu->readVecPredReg(prev_phys_reg));
+ setVecPredRegOperand(staticInst.get(), idx,
+ cpu->readVecPredReg(prev_phys_reg));
break;
case CCRegClass:
- this->setCCRegOperand(this->staticInst.get(), idx,
- this->cpu->readCCReg(prev_phys_reg));
+ setCCRegOperand(staticInst.get(), idx,
+ cpu->readCCReg(prev_phys_reg));
break;
case MiscRegClass:
// no need to forward misc reg values
@@ -1196,19 +1196,19 @@
RegVal
readIntRegOperand(const StaticInst *si, int idx) override
{
- return this->cpu->readIntReg(this->regs.renamedSrcIdx(idx));
+ return cpu->readIntReg(regs.renamedSrcIdx(idx));
}
RegVal
readFloatRegOperandBits(const StaticInst *si, int idx) override
{
- return this->cpu->readFloatReg(this->regs.renamedSrcIdx(idx));
+ return cpu->readFloatReg(regs.renamedSrcIdx(idx));
}
const TheISA::VecRegContainer&
readVecRegOperand(const StaticInst *si, int idx) const override
{
- return this->cpu->readVecReg(this->regs.renamedSrcIdx(idx));
+ return cpu->readVecReg(regs.renamedSrcIdx(idx));
}
/**
@@ -1217,32 +1217,31 @@
TheISA::VecRegContainer&
getWritableVecRegOperand(const StaticInst *si, int idx) override
{
- return
this->cpu->getWritableVecReg(this->regs.renamedDestIdx(idx));
+ return cpu->getWritableVecReg(regs.renamedDestIdx(idx));
}
RegVal
readVecElemOperand(const StaticInst *si, int idx) const override
{
- return this->cpu->readVecElem(this->regs.renamedSrcIdx(idx));
+ return cpu->readVecElem(regs.renamedSrcIdx(idx));
}
const TheISA::VecPredRegContainer&
readVecPredRegOperand(const StaticInst *si, int idx) const override
{
- return this->cpu->readVecPredReg(this->regs.renamedSrcIdx(idx));
+ return cpu->readVecPredReg(regs.renamedSrcIdx(idx));
}
TheISA::VecPredRegContainer&
getWritableVecPredRegOperand(const StaticInst *si, int idx) override
{
- return this->cpu->getWritableVecPredReg(
- this->regs.renamedDestIdx(idx));
+ return cpu->getWritableVecPredReg(regs.renamedDestIdx(idx));
}
RegVal
readCCRegOperand(const StaticInst *si, int idx) override
{
- return this->cpu->readCCReg(this->regs.renamedSrcIdx(idx));
+ return cpu->readCCReg(regs.renamedSrcIdx(idx));
}
/** @todo: Make results into arrays so they can handle multiple dest
@@ -1251,14 +1250,14 @@
void
setIntRegOperand(const StaticInst *si, int idx, RegVal val) override
{
- this->cpu->setIntReg(this->regs.renamedDestIdx(idx), val);
+ cpu->setIntReg(regs.renamedDestIdx(idx), val);
setResult(val);
}
void
setFloatRegOperandBits(const StaticInst *si, int idx, RegVal val)
override
{
- this->cpu->setFloatReg(this->regs.renamedDestIdx(idx), val);
+ cpu->setFloatReg(regs.renamedDestIdx(idx), val);
setResult(val);
}
@@ -1266,7 +1265,7 @@
setVecRegOperand(const StaticInst *si, int idx,
const TheISA::VecRegContainer& val) override
{
- this->cpu->setVecReg(this->regs.renamedDestIdx(idx), val);
+ cpu->setVecReg(regs.renamedDestIdx(idx), val);
setResult(val);
}
@@ -1274,7 +1273,7 @@
setVecElemOperand(const StaticInst *si, int idx, RegVal val) override
{
int reg_idx = idx;
- this->cpu->setVecElem(this->regs.renamedDestIdx(reg_idx), val);
+ cpu->setVecElem(regs.renamedDestIdx(reg_idx), val);
setResult(val);
}
@@ -1282,14 +1281,14 @@
setVecPredRegOperand(const StaticInst *si, int idx,
const TheISA::VecPredRegContainer& val) override
{
- this->cpu->setVecPredReg(this->regs.renamedDestIdx(idx), val);
+ cpu->setVecPredReg(regs.renamedDestIdx(idx), val);
setResult(val);
}
void
setCCRegOperand(const StaticInst *si, int idx, RegVal val) override
{
- this->cpu->setCCReg(this->regs.renamedDestIdx(idx), val);
+ cpu->setCCReg(regs.renamedDestIdx(idx), val);
setResult(val);
}
};
diff --git a/src/cpu/o3/free_list.hh b/src/cpu/o3/free_list.hh
index b634690..54edfc1 100644
--- a/src/cpu/o3/free_list.hh
+++ b/src/cpu/o3/free_list.hh
@@ -85,7 +85,7 @@
void
addRegs(InputIt first, InputIt last) {
std::for_each(first, last, [this](typename InputIt::value_type&
reg) {
- this->freeRegs.push(®);
+ freeRegs.push(®);
});
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/52484
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: I102d2016fbba0ca09f16e10d8741ae0e2f967681
Gerrit-Change-Number: 52484
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[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
