summaryrefslogtreecommitdiff
path: root/src/arch/arm/fastmodel/iris
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/arm/fastmodel/iris')
-rw-r--r--src/arch/arm/fastmodel/iris/arm/thread_context.cc8
-rw-r--r--src/arch/arm/fastmodel/iris/arm/thread_context.hh2
-rw-r--r--src/arch/arm/fastmodel/iris/cpu.cc6
-rw-r--r--src/arch/arm/fastmodel/iris/thread_context.hh6
4 files changed, 2 insertions, 20 deletions
diff --git a/src/arch/arm/fastmodel/iris/arm/thread_context.cc b/src/arch/arm/fastmodel/iris/arm/thread_context.cc
index 270adca4d..b8e98edcd 100644
--- a/src/arch/arm/fastmodel/iris/arm/thread_context.cc
+++ b/src/arch/arm/fastmodel/iris/arm/thread_context.cc
@@ -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
{
diff --git a/src/arch/arm/fastmodel/iris/arm/thread_context.hh b/src/arch/arm/fastmodel/iris/arm/thread_context.hh
index c747eba46..f5be14dde 100644
--- a/src/arch/arm/fastmodel/iris/arm/thread_context.hh
+++ b/src/arch/arm/fastmodel/iris/arm/thread_context.hh
@@ -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 *
diff --git a/src/arch/arm/fastmodel/iris/cpu.cc b/src/arch/arm/fastmodel/iris/cpu.cc
index 246fe0cf0..63cd731dc 100644
--- a/src/arch/arm/fastmodel/iris/cpu.cc
+++ b/src/arch/arm/fastmodel/iris/cpu.cc
@@ -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;
}
diff --git a/src/arch/arm/fastmodel/iris/thread_context.hh b/src/arch/arm/fastmodel/iris/thread_context.hh
index da9666161..73470c5b2 100644
--- a/src/arch/arm/fastmodel/iris/thread_context.hh
+++ b/src/arch/arm/fastmodel/iris/thread_context.hh
@@ -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(); }