From bde88913a8ddde5e4d7ebb769beeae948470be8b Mon Sep 17 00:00:00 2001 From: Nikos Nikoleris Date: Thu, 23 Apr 2020 17:27:44 +0100 Subject: [PATCH] arch-arm, mem-ruby, sim: Add missing overrides Change-Id: I5ab18960bd61953e68777746426adb657818f825 Signed-off-by: Nikos Nikoleris Reviewed-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28168 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/arch/arm/isa.hh | 4 ++-- src/mem/ruby/system/GPUCoalescer.hh | 12 ++++++------ src/mem/ruby/system/Sequencer.hh | 12 ++++++------ src/sim/kernel_workload.hh | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/arch/arm/isa.hh b/src/arch/arm/isa.hh index 5fec2dbb9..b4fbbbfcd 100644 --- a/src/arch/arm/isa.hh +++ b/src/arch/arm/isa.hh @@ -726,14 +726,14 @@ namespace ArmISA unsigned eCount); void - serialize(CheckpointOut &cp) const + serialize(CheckpointOut &cp) const override { DPRINTF(Checkpoint, "Serializing Arm Misc Registers\n"); SERIALIZE_ARRAY(miscRegs, NUM_PHYS_MISCREGS); } void - unserialize(CheckpointIn &cp) + unserialize(CheckpointIn &cp) override { DPRINTF(Checkpoint, "Unserializing Arm Misc Registers\n"); UNSERIALIZE_ARRAY(miscRegs, NUM_PHYS_MISCREGS); diff --git a/src/mem/ruby/system/GPUCoalescer.hh b/src/mem/ruby/system/GPUCoalescer.hh index 620b5ee6c..13211738d 100644 --- a/src/mem/ruby/system/GPUCoalescer.hh +++ b/src/mem/ruby/system/GPUCoalescer.hh @@ -102,9 +102,9 @@ class GPUCoalescer : public RubyPort void wakeup(); // Used only for deadlock detection void printProgress(std::ostream& out) const; - void resetStats(); + void resetStats() override; void collateStats(); - void regStats(); + void regStats() override; void writeCallback(Addr address, DataBlock& data); @@ -157,18 +157,18 @@ class GPUCoalescer : public RubyPort void recordCPWriteCallBack(MachineID myMachID, MachineID senderMachID); // Alternate implementations in VIPER Coalescer - virtual RequestStatus makeRequest(PacketPtr pkt); + virtual RequestStatus makeRequest(PacketPtr pkt) override; - int outstandingCount() const { return m_outstanding_count; } + int outstandingCount() const override { return m_outstanding_count; } bool - isDeadlockEventScheduled() const + isDeadlockEventScheduled() const override { return deadlockCheckEvent.scheduled(); } void - descheduleDeadlockEvent() + descheduleDeadlockEvent() override { deschedule(deadlockCheckEvent); } diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh index 05694788e..bb2819b15 100644 --- a/src/mem/ruby/system/Sequencer.hh +++ b/src/mem/ruby/system/Sequencer.hh @@ -86,9 +86,9 @@ class Sequencer : public RubyPort // Public Methods void wakeup(); // Used only for deadlock detection - void resetStats(); + void resetStats() override; void collateStats(); - void regStats(); + void regStats() override; void writeCallback(Addr address, DataBlock& data, @@ -106,14 +106,14 @@ class Sequencer : public RubyPort const Cycles forwardRequestTime = Cycles(0), const Cycles firstResponseTime = Cycles(0)); - RequestStatus makeRequest(PacketPtr pkt); + RequestStatus makeRequest(PacketPtr pkt) override; bool empty() const; - int outstandingCount() const { return m_outstanding_count; } + int outstandingCount() const override { return m_outstanding_count; } - bool isDeadlockEventScheduled() const + bool isDeadlockEventScheduled() const override { return deadlockCheckEvent.scheduled(); } - void descheduleDeadlockEvent() + void descheduleDeadlockEvent() override { deschedule(deadlockCheckEvent); } void print(std::ostream& out) const; diff --git a/src/sim/kernel_workload.hh b/src/sim/kernel_workload.hh index 972a539b1..b88051a55 100644 --- a/src/sim/kernel_workload.hh +++ b/src/sim/kernel_workload.hh @@ -98,7 +98,7 @@ class KernelWorkload : public Workload } bool - insertSymbol(Addr address, const std::string &symbol) + insertSymbol(Addr address, const std::string &symbol) override { return kernelSymtab->insert(address, symbol); } -- 2.30.2