Merged with head.

4 files changed, 15 insertions, 8 deletions

diff --git a/src/mem/ruby/system/CacheMemory.hh b/src/mem/ruby/system/CacheMemory.hh
index cfaa229a5..7a46bd3a5 100644
--- a/src/mem/ruby/system/CacheMemory.hh
+++ b/src/mem/ruby/system/CacheMemory.hh
@@ -127,6 +127,7 @@ public:
   void print(ostream& out) const;
   void printData(ostream& out) const;
 
+  void clearStats() const;
   void printStats(ostream& out) const;
 
 private:
@@ -561,6 +562,11 @@ void CacheMemory::printData(ostream& out) const
   out << "printData() not supported" << endl;
 }
 
+inline void CacheMemory::clearStats() const
+{
+  m_profiler_ptr->clearStats();
+}
+
 inline
 void CacheMemory::printStats(ostream& out) const
 {
diff --git a/src/mem/ruby/system/DMASequencer.cc b/src/mem/ruby/system/DMASequencer.cc
index 58ec7bb45..d29dba602 100644
--- a/src/mem/ruby/system/DMASequencer.cc
+++ b/src/mem/ruby/system/DMASequencer.cc
@@ -51,6 +51,7 @@ int64_t DMASequencer::makeRequest(const RubyRequest & request)
   case RubyRequestType_Locked_Write:
   case RubyRequestType_RMW_Read:
   case RubyRequestType_RMW_Write:
+  case RubyRequestType_NUM:
     assert(0);
   }
 
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
index 2c24c9ade..ad67cdc80 100644
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -347,15 +347,16 @@ void RubySystem::printStats(ostream& out)
 
 void RubySystem::clearStats() const
 {
-  /*
   m_profiler_ptr->clearStats();
-  for (int i=0; i<m_rubyRequestQueues.size(); i++)
-    for (int j=0;j<m_rubyRequestQueues[i].size(); j++)
-      m_rubyRequestQueues[i][j]->clearStats();
   m_network_ptr->clearStats();
-  for (int i=0; i < MachineType_base_level(MachineType_NUM); i++)
-    m_controllers[i][0]->clearStats();
-  */
+  for (map<string, CacheMemory*>::const_iterator it = m_caches.begin();
+       it != m_caches.end(); it++) {
+    (*it).second->clearStats();
+  }
+  for (map<string, AbstractController*>::const_iterator it = m_controllers.begin();
+       it != m_controllers.end(); it++) {
+    (*it).second->clearStats();
+  }
 }
 
 void RubySystem::recordCacheContents(CacheRecorder& tr) const
diff --git a/src/mem/ruby/system/TBETable.hh b/src/mem/ruby/system/TBETable.hh
index 7d2daa55a..2b00f7a06 100644
--- a/src/mem/ruby/system/TBETable.hh
+++ b/src/mem/ruby/system/TBETable.hh
@@ -128,7 +128,6 @@ void TBETable<ENTRY>::allocate(const Address& address)
 {
   assert(isPresent(address) == false);
   assert(m_map.size() < m_number_of_TBEs);
-  g_system_ptr->getProfiler()->L2tbeUsageSample(m_map.size());
   m_map.add(address, ENTRY());
 }