From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Fri, 22 Mar 2013 20:53:25 +0000 (-0500)
Subject: ruby: remove unsued profile functions
X-Git-Tag: stable_2013_06_16~44
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=28005a7626ca0b6972fb308a172481ba6c31ee8b;p=gem5.git

ruby: remove unsued profile functions
---

diff --git a/src/mem/protocol/RubySlicc_Profiler.sm b/src/mem/protocol/RubySlicc_Profiler.sm
index e09f30056..591366ebe 100644
--- a/src/mem/protocol/RubySlicc_Profiler.sm
+++ b/src/mem/protocol/RubySlicc_Profiler.sm
@@ -33,16 +33,11 @@
 void profile_miss(RubyRequest msg);
 
 // used by CMP protocols
-void profile_request(std::string L1CacheStateStr, std::string L2CacheStateStr,
-    std::string directoryStateStr, std::string requestTypeStr);
 void profileMessageReordering(bool wasReordered);
 void profileMessageReorderingByNetwork(int vnet, bool wasReordered);
 void profile_token_retry(Address addr, AccessType type, int count);
 void profile_persistent_prediction(Address addr, AccessType type);
 void profile_filter_action(int act);
-void profile_multicast_retry(Address addr, int count);
-void profile_outstanding_request(int outstanding);
-void profile_outstanding_persistent_request(int outstanding);
 // void profile_overlapping_persistent_request(int overlapping);
 void profile_average_latency_estimate(int latency);
 
diff --git a/src/mem/ruby/profiler/Profiler.cc b/src/mem/ruby/profiler/Profiler.cc
index 43c658830..4d05a5698 100644
--- a/src/mem/ruby/profiler/Profiler.cc
+++ b/src/mem/ruby/profiler/Profiler.cc
@@ -467,15 +467,6 @@ Profiler::printStats(ostream& out, bool short_stats)
             out << endl;
         }
 
-        if (m_outstanding_requests.size() > 0) {
-            out << "outstanding_requests: ";
-            m_outstanding_requests.printPercent(out);
-            out << endl;
-            out << endl;
-        }
-    }
-
-    if (!short_stats) {
         printRequestProfile(out);
 
         out << "filter_action: " << m_filter_action_histogram << endl;
@@ -576,13 +567,6 @@ Profiler::clearStats()
     m_cache_to_cache = 0;
     m_memory_to_cache = 0;
 
-    m_outstanding_requests.clear();
-    m_outstanding_persistent_requests.clear();
-
-    // Flush the prefetches through the system - used so that there
-    // are no outstanding requests after stats are cleared
-    //g_eventQueue_ptr->triggerAllEvents();
-
     // update the start time
     m_ruby_start = g_system_ptr->curCycle();
 }
diff --git a/src/mem/ruby/profiler/Profiler.hh b/src/mem/ruby/profiler/Profiler.hh
index aabe7bfaa..02c37bd60 100644
--- a/src/mem/ruby/profiler/Profiler.hh
+++ b/src/mem/ruby/profiler/Profiler.hh
@@ -103,18 +103,6 @@ class Profiler : public SimObject
 
     void profileConflictingRequests(const Address& addr);
 
-    void
-    profileOutstandingRequest(int outstanding)
-    {
-        m_outstanding_requests.add(outstanding);
-    }
-
-    void
-    profileOutstandingPersistentRequest(int outstanding)
-    {
-        m_outstanding_persistent_requests.add(outstanding);
-    }
-
     void
     profileAverageLatencyEstimate(int latency)
     {
@@ -213,11 +201,7 @@ class Profiler : public SimObject
     std::vector<Histogram> m_SWPrefetchLatencyHistograms;
     std::vector<Histogram> m_SWPrefetchMachLatencyHistograms;
 
-    Histogram m_outstanding_requests;
-    Histogram m_outstanding_persistent_requests;
-
     Histogram m_average_latency_estimate;
-
     m5::hash_set<Address> m_watch_address_set;
 
     //added by SS
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
index a8d8198ca..5c8c8d113 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
@@ -35,12 +35,6 @@
 
 using namespace std;
 
-void
-profile_outstanding_request(int outstanding)
-{
-    g_system_ptr->getProfiler()->profileOutstandingRequest(outstanding);
-}
-
 void
 profile_average_latency_estimate(int latency)
 {
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
index bfc0afd56..b84a01ee9 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
@@ -42,8 +42,6 @@
 
 class Set;
 
-void profile_outstanding_persistent_request(int outstanding);
-void profile_outstanding_request(int outstanding);
 void profile_sharing(const Address& addr, AccessType type, NodeID requestor,
                      const Set& sharers, const Set& owner);
 void profile_miss(const RubyRequest& msg, NodeID id);
@@ -52,12 +50,9 @@ void profile_filter_action(int action);
 void profile_persistent_prediction(const Address& addr, AccessType type);
 void profile_average_latency_estimate(int latency);
 
-void profile_multicast_retry(const Address& addr, int count);
 void profileGetX(const Address& datablock, const Address& PC, const Set& owner,
                  const Set& sharers, NodeID requestor);
 void profileGetS(const Address& datablock, const Address& PC, const Set& owner,
                  const Set& sharers, NodeID requestor);
 
-void profileOverflow(const Address & addr, MachineID mach);
-
 #endif // __MEM_RUBY_SLICC_INTERFACE_RUBYSLICC_PROFILER_INTERFACE_HH__