gem5-dev@gem5.org

The gem5 Developer List

View all threads

[S] Change in gem5/gem5[develop]: fastmodel: Remove sendFunc

WC
Wei-Han Chen (Gerrit)
Thu, May 4, 2023 7:53 AM

Wei-Han Chen has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/70157?usp=email )

Change subject: fastmodel: Remove sendFunc
......................................................................

fastmodel: Remove sendFunc

The original functionality is to access memory inside CPU. However, in
this CL: https://gem5-review.googlesource.com/c/public/gem5/+/45581,
the access method has been changed to use Iris API.

Thus, this CL removes this function.

Change-Id: Ide5e7c7c10a30b3c3ed00b97ba5894679d615e6b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70157
Tested-by: kokoro noreply+kokoro@google.com
Reviewed-by: Yu-hsin Wang yuhsingw@google.com
Maintainer: Gabe Black gabeblack@google.com

M src/arch/arm/fastmodel/CortexA76/evs.cc
M src/arch/arm/fastmodel/CortexA76/evs.hh
M src/arch/arm/fastmodel/CortexR52/evs.cc
M src/arch/arm/fastmodel/CortexR52/evs.hh
M src/arch/arm/fastmodel/iris/cpu.hh
5 files changed, 0 insertions(+), 25 deletions(-)

Approvals:
kokoro: Regressions pass
Yu-hsin Wang: Looks good to me, approved
Gabe Black: Looks good to me, approved

diff --git a/src/arch/arm/fastmodel/CortexA76/evs.cc
b/src/arch/arm/fastmodel/CortexA76/evs.cc
index b299ad1..6d21a37 100644
--- a/src/arch/arm/fastmodel/CortexA76/evs.cc
+++ b/src/arch/arm/fastmodel/CortexA76/evs.cc
@@ -134,16 +134,6 @@

template <class Types>
void
-ScxEvsCortexA76<Types>::sendFunc(PacketPtr pkt)
-{

  • auto *trans = sc_gem5::packet2payload(pkt);
  • panic_if(Base::amba->transport_dbg(*trans) != trans->get_data_length(),
  •        "Didn't send entire functional packet!");
    
  • trans->release();
    -}

-template <class Types>
-void
ScxEvsCortexA76<Types>::before_end_of_elaboration()
{
Base::before_end_of_elaboration();
diff --git a/src/arch/arm/fastmodel/CortexA76/evs.hh
b/src/arch/arm/fastmodel/CortexA76/evs.hh
index 9f08071..cdaa266 100644
--- a/src/arch/arm/fastmodel/CortexA76/evs.hh
+++ b/src/arch/arm/fastmodel/CortexA76/evs.hh
@@ -119,8 +119,6 @@
}
void start_of_simulation() override {}

  • void sendFunc(PacketPtr pkt) override;
  • void setClkPeriod(Tick clk_period) override;
    
    void setSysCounterFrq(uint64_t sys_counter_frq) override;
    

diff --git a/src/arch/arm/fastmodel/CortexR52/evs.cc
b/src/arch/arm/fastmodel/CortexR52/evs.cc
index 47fbc36..ee5b4cc 100644
--- a/src/arch/arm/fastmodel/CortexR52/evs.cc
+++ b/src/arch/arm/fastmodel/CortexR52/evs.cc
@@ -129,16 +129,6 @@
}

template <class Types>
-void
-ScxEvsCortexR52<Types>::sendFunc(PacketPtr pkt)
-{

  • auto *trans = sc_gem5::packet2payload(pkt);
  • panic_if(Base::amba[0]->transport_dbg(*trans) !=
    trans->get_data_length(),
  •        "Didn't send entire functional packet!");
    
  • trans->release();
    -}

-template <class Types>
Port &
ScxEvsCortexR52<Types>::gem5_getPort(const std::string &if_name, int idx)
{
diff --git a/src/arch/arm/fastmodel/CortexR52/evs.hh
b/src/arch/arm/fastmodel/CortexR52/evs.hh
index 6516f4c..79bc22f 100644
--- a/src/arch/arm/fastmodel/CortexR52/evs.hh
+++ b/src/arch/arm/fastmodel/CortexR52/evs.hh
@@ -158,8 +158,6 @@
}
void start_of_simulation() override {}

  • void sendFunc(PacketPtr pkt) override;
  • void setClkPeriod(Tick clk_period) override;
    
    void setSysCounterFrq(uint64_t sys_counter_frq) override;
    

diff --git a/src/arch/arm/fastmodel/iris/cpu.hh
b/src/arch/arm/fastmodel/iris/cpu.hh
index b43eb8e..dd3992c 100644
--- a/src/arch/arm/fastmodel/iris/cpu.hh
+++ b/src/arch/arm/fastmodel/iris/cpu.hh
@@ -47,7 +47,6 @@
class BaseCpuEvs
{
public:

  • virtual void sendFunc(PacketPtr pkt) = 0;
    virtual void setClkPeriod(Tick clk_period) = 0;
    virtual void setSysCounterFrq(uint64_t sys_counter_frq) = 0;
    virtual void setCluster(SimObject *cluster) = 0;

--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/70157?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings

Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ide5e7c7c10a30b3c3ed00b97ba5894679d615e6b
Gerrit-Change-Number: 70157
Gerrit-PatchSet: 2
Gerrit-Owner: Wei-Han Chen weihanchen@google.com
Gerrit-Reviewer: Gabe Black gabe.black@gmail.com
Gerrit-Reviewer: Gabe Black gabeblack@google.com
Gerrit-Reviewer: Wei-Han Chen weihanchen@google.com
Gerrit-Reviewer: Yu-hsin Wang yuhsingw@google.com
Gerrit-Reviewer: kokoro noreply+kokoro@google.com

Wei-Han Chen has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/70157?usp=email ) Change subject: fastmodel: Remove sendFunc ...................................................................... fastmodel: Remove sendFunc The original functionality is to access memory inside CPU. However, in this CL: https://gem5-review.googlesource.com/c/public/gem5/+/45581, the access method has been changed to use Iris API. Thus, this CL removes this function. Change-Id: Ide5e7c7c10a30b3c3ed00b97ba5894679d615e6b Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70157 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Yu-hsin Wang <yuhsingw@google.com> Maintainer: Gabe Black <gabeblack@google.com> --- M src/arch/arm/fastmodel/CortexA76/evs.cc M src/arch/arm/fastmodel/CortexA76/evs.hh M src/arch/arm/fastmodel/CortexR52/evs.cc M src/arch/arm/fastmodel/CortexR52/evs.hh M src/arch/arm/fastmodel/iris/cpu.hh 5 files changed, 0 insertions(+), 25 deletions(-) Approvals: kokoro: Regressions pass Yu-hsin Wang: Looks good to me, approved Gabe Black: Looks good to me, approved diff --git a/src/arch/arm/fastmodel/CortexA76/evs.cc b/src/arch/arm/fastmodel/CortexA76/evs.cc index b299ad1..6d21a37 100644 --- a/src/arch/arm/fastmodel/CortexA76/evs.cc +++ b/src/arch/arm/fastmodel/CortexA76/evs.cc @@ -134,16 +134,6 @@ template <class Types> void -ScxEvsCortexA76<Types>::sendFunc(PacketPtr pkt) -{ - auto *trans = sc_gem5::packet2payload(pkt); - panic_if(Base::amba->transport_dbg(*trans) != trans->get_data_length(), - "Didn't send entire functional packet!"); - trans->release(); -} - -template <class Types> -void ScxEvsCortexA76<Types>::before_end_of_elaboration() { Base::before_end_of_elaboration(); diff --git a/src/arch/arm/fastmodel/CortexA76/evs.hh b/src/arch/arm/fastmodel/CortexA76/evs.hh index 9f08071..cdaa266 100644 --- a/src/arch/arm/fastmodel/CortexA76/evs.hh +++ b/src/arch/arm/fastmodel/CortexA76/evs.hh @@ -119,8 +119,6 @@ } void start_of_simulation() override {} - void sendFunc(PacketPtr pkt) override; - void setClkPeriod(Tick clk_period) override; void setSysCounterFrq(uint64_t sys_counter_frq) override; diff --git a/src/arch/arm/fastmodel/CortexR52/evs.cc b/src/arch/arm/fastmodel/CortexR52/evs.cc index 47fbc36..ee5b4cc 100644 --- a/src/arch/arm/fastmodel/CortexR52/evs.cc +++ b/src/arch/arm/fastmodel/CortexR52/evs.cc @@ -129,16 +129,6 @@ } template <class Types> -void -ScxEvsCortexR52<Types>::sendFunc(PacketPtr pkt) -{ - auto *trans = sc_gem5::packet2payload(pkt); - panic_if(Base::amba[0]->transport_dbg(*trans) != trans->get_data_length(), - "Didn't send entire functional packet!"); - trans->release(); -} - -template <class Types> Port & ScxEvsCortexR52<Types>::gem5_getPort(const std::string &if_name, int idx) { diff --git a/src/arch/arm/fastmodel/CortexR52/evs.hh b/src/arch/arm/fastmodel/CortexR52/evs.hh index 6516f4c..79bc22f 100644 --- a/src/arch/arm/fastmodel/CortexR52/evs.hh +++ b/src/arch/arm/fastmodel/CortexR52/evs.hh @@ -158,8 +158,6 @@ } void start_of_simulation() override {} - void sendFunc(PacketPtr pkt) override; - void setClkPeriod(Tick clk_period) override; void setSysCounterFrq(uint64_t sys_counter_frq) override; diff --git a/src/arch/arm/fastmodel/iris/cpu.hh b/src/arch/arm/fastmodel/iris/cpu.hh index b43eb8e..dd3992c 100644 --- a/src/arch/arm/fastmodel/iris/cpu.hh +++ b/src/arch/arm/fastmodel/iris/cpu.hh @@ -47,7 +47,6 @@ class BaseCpuEvs { public: - virtual void sendFunc(PacketPtr pkt) = 0; virtual void setClkPeriod(Tick clk_period) = 0; virtual void setSysCounterFrq(uint64_t sys_counter_frq) = 0; virtual void setCluster(SimObject *cluster) = 0; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/70157?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-MessageType: merged Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: Ide5e7c7c10a30b3c3ed00b97ba5894679d615e6b Gerrit-Change-Number: 70157 Gerrit-PatchSet: 2 Gerrit-Owner: Wei-Han Chen <weihanchen@google.com> Gerrit-Reviewer: Gabe Black <gabe.black@gmail.com> Gerrit-Reviewer: Gabe Black <gabeblack@google.com> Gerrit-Reviewer: Wei-Han Chen <weihanchen@google.com> Gerrit-Reviewer: Yu-hsin Wang <yuhsingw@google.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com>