SMMUDeviceRetryEvent sendDeviceRetryEvent;

protected:

  void runReady();

Gabriel B. has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/67655?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: sim: Switch from EventWrapper to MemberEventWrapper before deprec ...................................................................... sim: Switch from EventWrapper to MemberEventWrapper before deprec Change-Id: I25c81787d522a0dd063112b6727669da46e0f0e7 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67655 Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br> Tested-by: kokoro <noreply+kokoro@google.com> Maintainer: Jason Lowe-Power <power.jg@gmail.com> --- M src/arch/sparc/isa.hh M src/base/remote_gdb.hh M src/dev/arm/smmu_v3.hh M src/dev/arm/smmu_v3_deviceifc.hh M src/dev/arm/smmu_v3_proc.cc M src/mem/qos/mem_sink.hh M src/sim/power_domain.hh M src/systemc/core/kernel.hh M src/systemc/core/scheduler.hh M util/systemc/systemc_within_gem5/systemc_simple_object/feeder.hh 10 files changed, 19 insertions(+), 24 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved kokoro: Regressions pass Daniel Carvalho: Looks good to me, approved diff --git a/src/arch/sparc/isa.hh b/src/arch/sparc/isa.hh index 22bfba4..dee71d6 100644 --- a/src/arch/sparc/isa.hh +++ b/src/arch/sparc/isa.hh @@ -133,13 +133,13 @@ void processSTickCompare(); void processHSTickCompare(); - typedef EventWrapper<ISA, &ISA::processTickCompare> TickCompareEvent; + typedef MemberEventWrapper<&ISA::processTickCompare> TickCompareEvent; TickCompareEvent *tickCompare = nullptr; - typedef EventWrapper<ISA, &ISA::processSTickCompare> STickCompareEvent; + typedef MemberEventWrapper<&ISA::processSTickCompare> STickCompareEvent; STickCompareEvent *sTickCompare = nullptr; - typedef EventWrapper<ISA, &ISA::processHSTickCompare> HSTickCompareEvent; + typedef MemberEventWrapper<&ISA::processHSTickCompare> HSTickCompareEvent; HSTickCompareEvent *hSTickCompare = nullptr; static const int NumGlobalRegs = 8; diff --git a/src/base/remote_gdb.hh b/src/base/remote_gdb.hh index 1c5cd9c..7981a13 100644 --- a/src/base/remote_gdb.hh +++ b/src/base/remote_gdb.hh @@ -274,8 +274,8 @@ BaseGdbRegCache *regCachePtr = nullptr; - EventWrapper<BaseRemoteGDB, &BaseRemoteGDB::connect> connectEvent; - EventWrapper<BaseRemoteGDB, &BaseRemoteGDB::detach> disconnectEvent; + MemberEventWrapper<&BaseRemoteGDB::connect> connectEvent; + MemberEventWrapper<&BaseRemoteGDB::detach> disconnectEvent; class TrapEvent : public Event { @@ -308,7 +308,7 @@ // Single step. void singleStep(); - EventWrapper<BaseRemoteGDB, &BaseRemoteGDB::singleStep> singleStepEvent; + MemberEventWrapper<&BaseRemoteGDB::singleStep> singleStepEvent; void clearSingleStep(); void setSingleStep(); diff --git a/src/dev/arm/smmu_v3.hh b/src/dev/arm/smmu_v3.hh index 25b91ff..8721352 100644 --- a/src/dev/arm/smmu_v3.hh +++ b/src/dev/arm/smmu_v3.hh @@ -167,7 +167,7 @@ SMMUAction runProcessTiming(SMMUProcess *proc, PacketPtr pkt); void processCommands(); - EventWrapper<SMMUv3, &SMMUv3::processCommands> processCommandsEvent; + MemberEventWrapper<&SMMUv3::processCommands> processCommandsEvent; void processCommand(const SMMUCommand &cmd); diff --git a/src/dev/arm/smmu_v3_deviceifc.hh b/src/dev/arm/smmu_v3_deviceifc.hh index c4ffa37..3152f8a 100644 --- a/src/dev/arm/smmu_v3_deviceifc.hh +++ b/src/dev/arm/smmu_v3_deviceifc.hh @@ -114,9 +114,7 @@ bool atsDeviceNeedsRetry; SMMUDeviceRetryEvent sendDeviceRetryEvent; - EventWrapper< - SMMUv3DeviceInterface, - &SMMUv3DeviceInterface::atsSendDeviceRetry> atsSendDeviceRetryEvent; + MemberEventWrapper<&SMMUv3DeviceInterface::atsSendDeviceRetry> atsSendDeviceRetryEvent; Port& getPort(const std::string &name, PortID id) override; diff --git a/src/dev/arm/smmu_v3_proc.cc b/src/dev/arm/smmu_v3_proc.cc index 2cf2cf9..ef3db5d 100644 --- a/src/dev/arm/smmu_v3_proc.cc +++ b/src/dev/arm/smmu_v3_proc.cc @@ -199,8 +199,7 @@ void SMMUProcess::scheduleWakeup(Tick when) { - auto *ep = new EventWrapper< - SMMUProcess, &SMMUProcess::wakeup> (this, true); + auto *ep = new MemberEventWrapper<&SMMUProcess::wakeup> (this, true); smmu.schedule(ep, when); } diff --git a/src/mem/qos/mem_sink.hh b/src/mem/qos/mem_sink.hh index d2310c6..bd42a9a 100644 --- a/src/mem/qos/mem_sink.hh +++ b/src/mem/qos/mem_sink.hh @@ -222,9 +222,7 @@ void processNextReqEvent(); /** Event wrapper to schedule next request handler function */ - EventWrapper< - MemSinkCtrl, - &MemSinkCtrl::processNextReqEvent> nextReqEvent; + MemberEventWrapper<&MemSinkCtrl::processNextReqEvent> nextReqEvent; /** * Check if the read queue has room for more entries diff --git a/src/sim/power_domain.hh b/src/sim/power_domain.hh index 96233e4..1264d8f 100644 --- a/src/sim/power_domain.hh +++ b/src/sim/power_domain.hh @@ -151,7 +151,7 @@ /** * Event to update the power states of the followers */ - EventWrapper<PowerDomain, &PowerDomain::setFollowerPowerStates> + MemberEventWrapper<&PowerDomain::setFollowerPowerStates> pwrStateUpdateEvent; protected: diff --git a/src/systemc/core/kernel.hh b/src/systemc/core/kernel.hh index 9dba903..ec47569 100644 --- a/src/systemc/core/kernel.hh +++ b/src/systemc/core/kernel.hh @@ -65,7 +65,7 @@ private: static void stopWork(); - gem5::EventWrapper<Kernel, &Kernel::t0Handler> t0Event; + gem5::MemberEventWrapper<&Kernel::t0Handler> t0Event; }; extern Kernel *kernel; diff --git a/src/systemc/core/scheduler.hh b/src/systemc/core/scheduler.hh index 6eabb56..49ad6c6 100644 --- a/src/systemc/core/scheduler.hh +++ b/src/systemc/core/scheduler.hh @@ -465,13 +465,13 @@ } void runReady(); - gem5::EventWrapper<Scheduler, &Scheduler::runReady> readyEvent; + gem5::MemberEventWrapper<&Scheduler::runReady> readyEvent; void scheduleReadyEvent(); void pause(); void stop(); - gem5::EventWrapper<Scheduler, &Scheduler::pause> pauseEvent; - gem5::EventWrapper<Scheduler, &Scheduler::stop> stopEvent; + gem5::MemberEventWrapper<&Scheduler::pause> pauseEvent; + gem5::MemberEventWrapper<&Scheduler::stop> stopEvent; const ::sc_core::sc_report *_throwUp; @@ -484,7 +484,7 @@ timeSlots.front()->targeted_when > maxTick) && initList.empty()); } - gem5::EventWrapper<Scheduler, &Scheduler::pause> starvationEvent; + gem5::MemberEventWrapper<&Scheduler::pause> starvationEvent; void scheduleStarvationEvent(); bool _elaborationDone; @@ -502,10 +502,10 @@ _changeStamp++; pause(); } - gem5::EventWrapper<Scheduler, &Scheduler::maxTickFunc> maxTickEvent; + gem5::MemberEventWrapper<&Scheduler::maxTickFunc> maxTickEvent; void timeAdvances() { trace(false); } - gem5::EventWrapper<Scheduler, &Scheduler::timeAdvances> timeAdvancesEvent; + gem5::MemberEventWrapper<&Scheduler::timeAdvances> timeAdvancesEvent; void scheduleTimeAdvancesEvent() { diff --git a/util/systemc/systemc_within_gem5/systemc_simple_object/feeder.hh b/util/systemc/systemc_within_gem5/systemc_simple_object/feeder.hh index c843c83..865362c 100644 --- a/util/systemc/systemc_within_gem5/systemc_simple_object/feeder.hh +++ b/util/systemc/systemc_within_gem5/systemc_simple_object/feeder.hh @@ -64,7 +64,7 @@ // except to help interact with systemc objects/models. sc_core::sc_buffer<const char *> buf; - gem5::EventWrapper<Feeder, &Feeder::feed> event; + gem5::MemberEventWrapper<&Feeder::feed> event; void startup() override; }; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/67655?usp=email 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: I25c81787d522a0dd063112b6727669da46e0f0e7 Gerrit-Change-Number: 67655 Gerrit-PatchSet: 4 Gerrit-Owner: Gabriel B. <gabriel.busnot@arteris.com> Gerrit-Reviewer: Daniel Carvalho <odanrc@yahoo.com.br> Gerrit-Reviewer: Gabriel B. <gabriel.busnot@arteris.com> Gerrit-Reviewer: Jason Lowe-Power <jason@lowepower.com> Gerrit-Reviewer: Jason Lowe-Power <power.jg@gmail.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-MessageType: merged