From fd52a63e24fe047e1dafc48e5da9b4ce1b086c49 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Thu, 7 Apr 2016 10:42:07 +0100 Subject: Revert to 74c1e6513bd0 (sim: Thermal support for Linux) --- src/mem/probes/stack_dist.cc | 2 -- src/mem/ruby/network/garnet/BaseGarnetNetwork.cc | 2 -- src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc | 2 -- src/mem/ruby/network/simple/SimpleNetwork.cc | 2 -- src/mem/ruby/network/simple/Switch.cc | 2 -- src/mem/ruby/slicc_interface/AbstractController.cc | 2 -- src/mem/ruby/structures/CacheMemory.cc | 2 -- src/mem/ruby/structures/Prefetcher.cc | 2 -- src/mem/ruby/system/RubySystem.hh | 5 +---- src/mem/ruby/system/Sequencer.cc | 2 -- src/mem/snoop_filter.cc | 2 -- 11 files changed, 1 insertion(+), 24 deletions(-) (limited to 'src/mem') diff --git a/src/mem/probes/stack_dist.cc b/src/mem/probes/stack_dist.cc index b12c81e2c..a447f49e5 100644 --- a/src/mem/probes/stack_dist.cc +++ b/src/mem/probes/stack_dist.cc @@ -57,8 +57,6 @@ StackDistProbe::StackDistProbe(StackDistProbeParams *p) void StackDistProbe::regStats() { - BaseMemProbe::regStats(); - const StackDistProbeParams *p( dynamic_cast(params())); assert(p); diff --git a/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc b/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc index 2bd2acb9f..1213073e9 100644 --- a/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc +++ b/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc @@ -69,8 +69,6 @@ BaseGarnetNetwork::init() void BaseGarnetNetwork::regStats() { - Network::regStats(); - m_flits_received .init(m_virtual_networks) .name(name() + ".flits_received") diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc index dab9b7dda..97bc1abdd 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc @@ -158,8 +158,6 @@ Router_d::update_sw_winner(int inport, flit_d *t_flit) void Router_d::regStats() { - BasicRouter::regStats(); - m_buffer_reads .name(name() + ".buffer_reads") .flags(Stats::nozero) diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc index 2fc7b6440..25d0b6f4b 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.cc +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc @@ -132,8 +132,6 @@ SimpleNetwork::makeInternalLink(SwitchID src, SwitchID dest, BasicLink* link, void SimpleNetwork::regStats() { - Network::regStats(); - for (MessageSizeType type = MessageSizeType_FIRST; type < MessageSizeType_NUM; ++type) { m_msg_counts[(unsigned int) type] diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc index 78f5b609c..747884f16 100644 --- a/src/mem/ruby/network/simple/Switch.cc +++ b/src/mem/ruby/network/simple/Switch.cc @@ -112,8 +112,6 @@ Switch::getThrottle(LinkID link_number) const void Switch::regStats() { - BasicRouter::regStats(); - for (int link = 0; link < m_throttles.size(); link++) { m_throttles[link]->regStats(name()); } diff --git a/src/mem/ruby/slicc_interface/AbstractController.cc b/src/mem/ruby/slicc_interface/AbstractController.cc index be48628e9..2a53e53be 100644 --- a/src/mem/ruby/slicc_interface/AbstractController.cc +++ b/src/mem/ruby/slicc_interface/AbstractController.cc @@ -76,8 +76,6 @@ AbstractController::resetStats() void AbstractController::regStats() { - MemObject::regStats(); - m_fully_busy_cycles .name(name() + ".fully_busy_cycles") .desc("cycles for which number of transistions == max transitions") diff --git a/src/mem/ruby/structures/CacheMemory.cc b/src/mem/ruby/structures/CacheMemory.cc index 36d109769..f7c196119 100644 --- a/src/mem/ruby/structures/CacheMemory.cc +++ b/src/mem/ruby/structures/CacheMemory.cc @@ -488,8 +488,6 @@ CacheMemory::isLocked(Addr address, int context) void CacheMemory::regStats() { - SimObject::regStats(); - m_demand_hits .name(name() + ".demand_hits") .desc("Number of cache demand hits") diff --git a/src/mem/ruby/structures/Prefetcher.cc b/src/mem/ruby/structures/Prefetcher.cc index eef51dcf7..ce6d36c04 100644 --- a/src/mem/ruby/structures/Prefetcher.cc +++ b/src/mem/ruby/structures/Prefetcher.cc @@ -86,8 +86,6 @@ Prefetcher::~Prefetcher() void Prefetcher::regStats() { - SimObject::regStats(); - numMissObserved .name(name() + ".miss_observed") .desc("number of misses observed") diff --git a/src/mem/ruby/system/RubySystem.hh b/src/mem/ruby/system/RubySystem.hh index 8ebd3494a..62330e19d 100644 --- a/src/mem/ruby/system/RubySystem.hh +++ b/src/mem/ruby/system/RubySystem.hh @@ -89,10 +89,7 @@ class RubySystem : public ClockedObject return m_profiler; } - void regStats() override { - ClockedObject::regStats(); - m_profiler->regStats(name()); - } + void regStats() override { m_profiler->regStats(name()); } void collateStats() { m_profiler->collateStats(); } void resetStats() override; diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index fbaad8407..dedade3cf 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -688,8 +688,6 @@ Sequencer::evictionCallback(Addr address) void Sequencer::regStats() { - RubyPort::regStats(); - m_store_waiting_on_load .name(name() + ".store_waiting_on_load") .desc("Number of times a store aliased with a pending load") diff --git a/src/mem/snoop_filter.cc b/src/mem/snoop_filter.cc index 9e8f8afb8..9d02ed249 100755 --- a/src/mem/snoop_filter.cc +++ b/src/mem/snoop_filter.cc @@ -351,8 +351,6 @@ SnoopFilter::updateResponse(const Packet* cpkt, const SlavePort& slave_port) void SnoopFilter::regStats() { - SimObject::regStats(); - totRequests .name(name() + ".tot_requests") .desc("Total number of requests made to the snoop filter."); -- cgit v1.2.3