From: Gabe Black <gabeblack@google.com>
Date: Mon, 14 Oct 2019 06:57:22 +0000 (-0700)
Subject: fastmodel: Use getCurrentInstCount for totalInsts().
X-Git-Tag: v19.0.0.0~398
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bdfeefa4a8de4b553fbc41d359449abe87b3c5ba;p=gem5.git

fastmodel: Use getCurrentInstCount for totalInsts().

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>
---

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(); }