derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fastmodel: Use getCurrentInstCount for totalInsts().

Browse Source 
This had been using a custom totalInsts method on the iris
ThreadContext, but since that's equivalent to what the totalInsts
method does only through a different mechanism, we can
drop that and use getCurrentInstCount instead.

Change-Id: I058fec13e81f28285281e136635d53a2e849cb47
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22112
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabe Black
2019-10-13 23:57:22 -07:00
parent 54b9d49ec7
commit bdfeefa4a8
4 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/arm/fastmodel/iris/arm/thread_context.cc
View File

@@ -105,14 +105,6 @@ ArmThreadContext::nextInstAddr() const
return pcState().nextInstAddr();
}
Counter
ArmThreadContext::totalInsts()
{
iris::ResourceReadResult result;
call().resource_read(_instId, result, icountRscId);
return result.data.at(0);
}
uint64_t
ArmThreadContext::readIntReg(RegIndex reg_idx) const
{

2
src/arch/arm/fastmodel/iris/arm/thread_context.hh
View File

@@ -62,8 +62,6 @@ class ArmThreadContext : public Iris::ThreadContext
ResourceIds intReg32Ids;
ResourceIds intReg64Ids;
Counter totalInsts() override;
void setIntReg(RegIndex reg_idx, RegVal val) override;
RegVal readIntReg(RegIndex reg_idx) const override;
TheISA::ISA *

6
src/arch/arm/fastmodel/iris/cpu.cc
View File

@@ -82,10 +82,8 @@ Counter
BaseCPU::totalInsts() const
{
Counter count = 0;
for (auto *tc: threadContexts) {
auto *itc = dynamic_cast<Iris::ThreadContext *>(tc);
count += itc->totalInsts();
}
for (auto *tc: threadContexts)
count += tc->getCurrentInstCount();
return count;
}

6
src/arch/arm/fastmodel/iris/thread_context.hh
View File

@@ -102,12 +102,6 @@ class ThreadContext : public ::ThreadContext
void descheduleInstCountEvent(Event *event) override {}
Tick getCurrentInstCount() override;
virtual Counter
totalInsts()
{
panic("%s not implemented.", __FUNCTION__);
}
::BaseCPU *getCpuPtr() override { return _cpu; }
int cpuId() const override { return _cpu->cpuId(); }
uint32_t socketId() const override { return _cpu->socketId(); }