changeset 2ab58c54de63 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=2ab58c54de63
description:
ruby: continue style pass
diffstat:
12 files changed, 1472 insertions(+), 1474 deletions(-)
src/mem/ruby/profiler/AccessTraceForAddress.cc | 135 +--
src/mem/ruby/profiler/AccessTraceForAddress.hh | 108 +-
src/mem/ruby/profiler/AddressProfiler.cc | 484 ++++++------
src/mem/ruby/profiler/AddressProfiler.hh | 117 +-
src/mem/ruby/profiler/CacheProfiler.cc | 163 ++--
src/mem/ruby/profiler/CacheProfiler.hh | 90 --
src/mem/ruby/profiler/MemCntrlProfiler.cc | 197 ++--
src/mem/ruby/profiler/MemCntrlProfiler.hh | 133 +--
src/mem/ruby/profiler/Profiler.cc | 965 ++++++++++++------------
src/mem/ruby/profiler/Profiler.hh | 259 +++---
src/mem/ruby/profiler/StoreTrace.cc | 183 ++--
src/mem/ruby/profiler/StoreTrace.hh | 112 +-
diffs (truncated from 3547 to 300 lines):
diff -r 04d988a19ae9 -r 2ab58c54de63
src/mem/ruby/profiler/AccessTraceForAddress.cc
--- a/src/mem/ruby/profiler/AccessTraceForAddress.cc Tue Mar 23 16:31:47
2010 -0700
+++ b/src/mem/ruby/profiler/AccessTraceForAddress.cc Tue Mar 23 22:49:43
2010 -0700
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
* All rights reserved.
@@ -27,100 +26,96 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- * $Id$
- *
- */
-
+#include "mem/ruby/common/Histogram.hh"
#include "mem/ruby/profiler/AccessTraceForAddress.hh"
-#include "mem/ruby/common/Histogram.hh"
AccessTraceForAddress::AccessTraceForAddress()
{
- m_histogram_ptr = NULL;
+ m_histogram_ptr = NULL;
}
AccessTraceForAddress::AccessTraceForAddress(const Address& addr)
{
- m_addr = addr;
- m_total = 0;
- m_loads = 0;
- m_stores = 0;
- m_atomics = 0;
- m_user = 0;
- m_sharing = 0;
- m_histogram_ptr = NULL;
+ m_addr = addr;
+ m_total = 0;
+ m_loads = 0;
+ m_stores = 0;
+ m_atomics = 0;
+ m_user = 0;
+ m_sharing = 0;
+ m_histogram_ptr = NULL;
}
AccessTraceForAddress::~AccessTraceForAddress()
{
- if (m_histogram_ptr != NULL) {
- delete m_histogram_ptr;
- m_histogram_ptr = NULL;
- }
+ if (m_histogram_ptr != NULL) {
+ delete m_histogram_ptr;
+ m_histogram_ptr = NULL;
+ }
}
-void AccessTraceForAddress::print(ostream& out) const
+void
+AccessTraceForAddress::print(ostream& out) const
{
- out << m_addr;
+ out << m_addr;
- if (m_histogram_ptr == NULL) {
- out << " " << m_total;
- out << " | " << m_loads;
- out << " " << m_stores;
- out << " " << m_atomics;
- out << " | " << m_user;
- out << " " << m_total-m_user;
- out << " | " << m_sharing;
- out << " | " << m_touched_by.count();
- } else {
- assert(m_total == 0);
- out << " " << (*m_histogram_ptr);
- }
+ if (m_histogram_ptr == NULL) {
+ out << " " << m_total;
+ out << " | " << m_loads;
+ out << " " << m_stores;
+ out << " " << m_atomics;
+ out << " | " << m_user;
+ out << " " << m_total-m_user;
+ out << " | " << m_sharing;
+ out << " | " << m_touched_by.count();
+ } else {
+ assert(m_total == 0);
+ out << " " << (*m_histogram_ptr);
+ }
}
-void AccessTraceForAddress::update(CacheRequestType type, AccessModeType
access_mode, NodeID cpu, bool sharing_miss)
+void
+AccessTraceForAddress::update(CacheRequestType type,
+ AccessModeType access_mode, NodeID cpu,
+ bool sharing_miss)
{
- m_touched_by.add(cpu);
- m_total++;
- if(type == CacheRequestType_ATOMIC) {
- m_atomics++;
- } else if(type == CacheRequestType_LD){
- m_loads++;
- } else if (type == CacheRequestType_ST){
- m_stores++;
- } else {
- // ERROR_MSG("Trying to add invalid access to trace");
- }
+ m_touched_by.add(cpu);
+ m_total++;
+ if(type == CacheRequestType_ATOMIC) {
+ m_atomics++;
+ } else if(type == CacheRequestType_LD){
+ m_loads++;
+ } else if (type == CacheRequestType_ST){
+ m_stores++;
+ } else {
+ // ERROR_MSG("Trying to add invalid access to trace");
+ }
- if (access_mode == AccessModeType_UserMode) {
- m_user++;
- }
+ if (access_mode == AccessModeType_UserMode) {
+ m_user++;
+ }
- if (sharing_miss) {
- m_sharing++;
- }
+ if (sharing_miss) {
+ m_sharing++;
+ }
}
-int AccessTraceForAddress::getTotal() const
+int
+AccessTraceForAddress::getTotal() const
{
- if (m_histogram_ptr == NULL) {
- return m_total;
- } else {
- return m_histogram_ptr->getTotal();
- }
+ if (m_histogram_ptr == NULL) {
+ return m_total;
+ } else {
+ return m_histogram_ptr->getTotal();
+ }
}
-void AccessTraceForAddress::addSample(int value)
+void
+AccessTraceForAddress::addSample(int value)
{
- assert(m_total == 0);
- if (m_histogram_ptr == NULL) {
- m_histogram_ptr = new Histogram;
- }
- m_histogram_ptr->add(value);
+ assert(m_total == 0);
+ if (m_histogram_ptr == NULL) {
+ m_histogram_ptr = new Histogram;
+ }
+ m_histogram_ptr->add(value);
}
-
-bool node_less_then_eq(const AccessTraceForAddress* n1, const
AccessTraceForAddress* n2)
-{
- return (n1->getTotal() > n2->getTotal());
-}
diff -r 04d988a19ae9 -r 2ab58c54de63
src/mem/ruby/profiler/AccessTraceForAddress.hh
--- a/src/mem/ruby/profiler/AccessTraceForAddress.hh Tue Mar 23 16:31:47
2010 -0700
+++ b/src/mem/ruby/profiler/AccessTraceForAddress.hh Tue Mar 23 22:49:43
2010 -0700
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
* All rights reserved.
@@ -27,77 +26,60 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- * $Id$
- *
- * Description:
- *
- */
+#ifndef __MEM_RUBY_PROFILER_ACCESSTRACEFORADDRESS_HH__
+#define __MEM_RUBY_PROFILER_ACCESSTRACEFORADDRESS_HH__
-#ifndef ACCESSTRACEFORADDRESS_H
-#define ACCESSTRACEFORADDRESS_H
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/ruby/system/NodeID.hh"
-#include "mem/ruby/common/Global.hh"
-#include "mem/ruby/common/Address.hh"
-#include "mem/protocol/CacheRequestType.hh"
-#include "mem/protocol/AccessModeType.hh"
-#include "mem/ruby/system/NodeID.hh"
-#include "mem/ruby/common/Set.hh"
class Histogram;
-class AccessTraceForAddress {
-public:
- // Constructors
- AccessTraceForAddress();
- explicit AccessTraceForAddress(const Address& addr);
+class AccessTraceForAddress
+{
+ public:
+ AccessTraceForAddress();
+ explicit AccessTraceForAddress(const Address& addr);
+ ~AccessTraceForAddress();
- // Destructor
- ~AccessTraceForAddress();
+ void update(CacheRequestType type, AccessModeType access_mode, NodeID cpu,
+ bool sharing_miss);
+ int getTotal() const;
+ int getSharing() const { return m_sharing; }
+ int getTouchedBy() const { return m_touched_by.count(); }
+ const Address& getAddress() const { return m_addr; }
+ void addSample(int value);
- // Public Methods
+ void print(ostream& out) const;
- void update(CacheRequestType type, AccessModeType access_mode, NodeID cpu,
bool sharing_miss);
- int getTotal() const;
- int getSharing() const { return m_sharing; }
- int getTouchedBy() const { return m_touched_by.count(); }
- const Address& getAddress() const { return m_addr; }
- void addSample(int value);
-
- void print(ostream& out) const;
-private:
- // Private Methods
-
- // Private copy constructor and assignment operator
- // AccessTraceForAddress(const AccessTraceForAddress& obj);
- // AccessTraceForAddress& operator=(const AccessTraceForAddress& obj);
-
- // Data Members (m_ prefix)
-
- Address m_addr;
- uint64 m_loads;
- uint64 m_stores;
- uint64 m_atomics;
- uint64 m_total;
- uint64 m_user;
- uint64 m_sharing;
- Set m_touched_by;
- Histogram* m_histogram_ptr;
+ private:
+ Address m_addr;
+ uint64 m_loads;
+ uint64 m_stores;
+ uint64 m_atomics;
+ uint64 m_total;
+ uint64 m_user;
+ uint64 m_sharing;
+ Set m_touched_by;
+ Histogram* m_histogram_ptr;
};
-bool node_less_then_eq(const AccessTraceForAddress* n1, const
AccessTraceForAddress* n2);
-
-// Output operator declaration
-ostream& operator<<(ostream& out, const AccessTraceForAddress& obj);
-
-// ******************* Definitions *******************
-
-// Output operator definition
-extern inline
-ostream& operator<<(ostream& out, const AccessTraceForAddress& obj)
+inline bool
+node_less_then_eq(const AccessTraceForAddress* n1,
+ const AccessTraceForAddress* n2)
{
- obj.print(out);
- out << flush;
- return out;
+ return n1->getTotal() > n2->getTotal();
}
-#endif //ACCESSTRACEFORADDRESS_H
+inline ostream&
+operator<<(ostream& out, const AccessTraceForAddress& obj)
+{
+ obj.print(out);
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
