changeset 7d6862b80049 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=7d6862b80049
description:
style: another ruby style pass
diffstat:
46 files changed, 2195 insertions(+), 2958 deletions(-)
src/mem/ruby/SConsopts | 4
src/mem/ruby/common/Address.hh | 4
src/mem/ruby/eventqueue/RubyEventQueueNode.hh | 14
src/mem/ruby/libruby.hh | 6
src/mem/ruby/network/Network.cc | 74 -
src/mem/ruby/network/Network.hh | 142 +-
src/mem/ruby/network/simple/HierarchicalSwitchTopology.cc | 66 -
src/mem/ruby/network/simple/HierarchicalSwitchTopology.hh | 17
src/mem/ruby/network/simple/PerfectSwitch.cc | 459 ++++----
src/mem/ruby/network/simple/PerfectSwitch.hh | 113 --
src/mem/ruby/network/simple/PtToPtTopology.hh | 17
src/mem/ruby/network/simple/SimpleNetwork.cc | 393 +++----
src/mem/ruby/network/simple/SimpleNetwork.hh | 124 +-
src/mem/ruby/network/simple/Switch.cc | 245 ++--
src/mem/ruby/network/simple/Switch.hh | 99 -
src/mem/ruby/network/simple/Throttle.cc | 331 +++---
src/mem/ruby/network/simple/Throttle.hh | 133 +-
src/mem/ruby/network/simple/Topology.cc | 556 +++++-----
src/mem/ruby/network/simple/Topology.hh | 149 +-
src/mem/ruby/network/simple/Torus2DTopology.cc | 84 -
src/mem/ruby/network/simple/Torus2DTopology.hh | 17
src/mem/ruby/network/topologies/Crossbar.py | 2
src/mem/ruby/network/topologies/Mesh.py | 19
src/mem/ruby/network/topologies/MeshDirCorners.py | 41
src/mem/ruby/network/topologies/SConscript | 2
src/mem/ruby/profiler/AddressProfiler.cc | 2
src/mem/ruby/profiler/Profiler.cc | 8
src/mem/ruby/recorder/CacheRecorder.cc | 56 -
src/mem/ruby/recorder/CacheRecorder.hh | 66 -
src/mem/ruby/recorder/TraceRecord.cc | 152 +-
src/mem/ruby/recorder/TraceRecord.hh | 106 --
src/mem/ruby/recorder/Tracer.cc | 203 +--
src/mem/ruby/recorder/Tracer.hh | 92 -
src/mem/ruby/storebuffer/hfa.hh | 103 -
src/mem/ruby/storebuffer/hfatypes.hh | 80 -
src/mem/ruby/storebuffer/interface.cc | 67 -
src/mem/ruby/storebuffer/interface.hh | 46
src/mem/ruby/storebuffer/stb_interface.cc | 72 -
src/mem/ruby/storebuffer/stb_interface.hh | 20
src/mem/ruby/storebuffer/storebuffer.cc | 676 ++++---------
src/mem/ruby/storebuffer/storebuffer.hh | 163 +--
src/mem/ruby/system/DirectoryMemory.cc | 4
src/mem/ruby/system/PersistentTable.cc | 2
src/mem/ruby/system/PersistentTable.hh | 2
src/mem/ruby/system/SparseMemory.cc | 102 -
src/mem/ruby/system/SparseMemory.hh | 20
diffs (truncated from 6766 to 300 lines):
diff -r 28cb3b80435c -r 7d6862b80049 src/mem/ruby/SConsopts
--- a/src/mem/ruby/SConsopts Mon Mar 29 20:39:02 2010 -0400
+++ b/src/mem/ruby/SConsopts Wed Mar 31 16:56:45 2010 -0700
@@ -37,9 +37,7 @@
BoolVariable('NO_VECTOR_BOUNDS_CHECKS', "Don't do bounds checks", True),
BoolVariable('RUBY_DEBUG', "Add debugging stuff to Ruby", False),
('GEMS_ROOT', "Add debugging stuff to Ruby", Dir('..').srcnode().abspath),
- BoolVariable('RUBY_TSO_CHECKER', "Use the Ruby TSO Checker", False)
)
-export_vars += [ 'NO_VECTOR_BOUNDS_CHECKS', 'RUBY_DEBUG', 'GEMS_ROOT',
- 'RUBY_TSO_CHECKER' ]
+export_vars += [ 'NO_VECTOR_BOUNDS_CHECKS', 'RUBY_DEBUG', 'GEMS_ROOT' ]
diff -r 28cb3b80435c -r 7d6862b80049 src/mem/ruby/common/Address.hh
--- a/src/mem/ruby/common/Address.hh Mon Mar 29 20:39:02 2010 -0400
+++ b/src/mem/ruby/common/Address.hh Wed Mar 31 16:56:45 2010 -0700
@@ -171,7 +171,7 @@
{
physical_address_t mask;
assert((unsigned)big >= (unsigned)small);
-
+
if (small >= ADDRESS_WIDTH - 1) {
return m_address;
} else if (big >= ADDRESS_WIDTH - 1) {
@@ -228,7 +228,7 @@
Address::memoryModuleIndex() const
{
integer_t index =
- bitSelect(RubySystem::getBlockSizeBits() +
+ bitSelect(RubySystem::getBlockSizeBits() +
RubySystem::getMemorySizeBits(), ADDRESS_WIDTH);
assert (index >= 0);
return index;
diff -r 28cb3b80435c -r 7d6862b80049
src/mem/ruby/eventqueue/RubyEventQueueNode.hh
--- a/src/mem/ruby/eventqueue/RubyEventQueueNode.hh Mon Mar 29 20:39:02
2010 -0400
+++ b/src/mem/ruby/eventqueue/RubyEventQueueNode.hh Wed Mar 31 16:56:45
2010 -0700
@@ -38,18 +38,18 @@
class RubyEventQueueNode : public Event
{
public:
- RubyEventQueueNode(Consumer* _consumer, RubyEventQueue* _eventq)
+ RubyEventQueueNode(Consumer* _consumer, RubyEventQueue* _eventq)
: m_consumer_ptr(_consumer), m_eventq_ptr(_eventq)
- {
- setFlags(AutoDelete);
+ {
+ setFlags(AutoDelete);
}
void print(std::ostream& out) const;
virtual void
- process()
- {
- m_consumer_ptr->wakeup();
- m_consumer_ptr->removeScheduledWakeupTime(m_eventq_ptr->getTime());
+ process()
+ {
+ m_consumer_ptr->wakeup();
+ m_consumer_ptr->removeScheduledWakeupTime(m_eventq_ptr->getTime());
}
virtual const char *description() const { return "Ruby Event"; }
diff -r 28cb3b80435c -r 7d6862b80049 src/mem/ruby/libruby.hh
--- a/src/mem/ruby/libruby.hh Mon Mar 29 20:39:02 2010 -0400
+++ b/src/mem/ruby/libruby.hh Wed Mar 31 16:56:45 2010 -0700
@@ -156,17 +156,17 @@
/**
* does not return until done
- */
+ */
void libruby_playback_trace(char *trace_filename);
/*
* enables the tracer and opens the trace file
- */
+ */
void libruby_start_tracing(char *record_filename);
/*
* closes the trace file
- */
+ */
void libruby_stop_tracing();
/**
diff -r 28cb3b80435c -r 7d6862b80049 src/mem/ruby/network/Network.cc
--- a/src/mem/ruby/network/Network.cc Mon Mar 29 20:39:02 2010 -0400
+++ b/src/mem/ruby/network/Network.cc Wed Mar 31 16:56:45 2010 -0700
@@ -41,55 +41,57 @@
m_link_latency = p->link_latency;
m_control_msg_size = p->control_msg_size;
- //
// Total nodes/controllers in network
// Must make sure this is called after the State Machine constructors
- //
- m_nodes = MachineType_base_number(MachineType_NUM);
+ m_nodes = MachineType_base_number(MachineType_NUM);
assert(m_nodes != 0);
assert(m_virtual_networks != 0);
assert(m_topology_ptr != NULL);
- //
// Initialize the controller's network pointers
- //
m_topology_ptr->initNetworkPtr(this);
}
-void Network::init()
+void
+Network::init()
{
- m_data_msg_size = RubySystem::getBlockSizeBytes() + m_control_msg_size;
+ m_data_msg_size = RubySystem::getBlockSizeBytes() + m_control_msg_size;
}
-int Network::MessageSizeType_to_int(MessageSizeType size_type)
+int
+Network::MessageSizeType_to_int(MessageSizeType size_type)
{
- switch(size_type) {
- case MessageSizeType_Undefined:
- ERROR_MSG("Can't convert Undefined MessageSizeType to integer");
- break;
- case MessageSizeType_Control:
- case MessageSizeType_Request_Control:
- case MessageSizeType_Reissue_Control:
- case MessageSizeType_Response_Control:
- case MessageSizeType_Writeback_Control:
- case MessageSizeType_Forwarded_Control:
- case MessageSizeType_Invalidate_Control:
- case MessageSizeType_Unblock_Control:
- case MessageSizeType_Persistent_Control:
- case MessageSizeType_Completion_Control:
- return m_control_msg_size;
- break;
- case MessageSizeType_Data:
- case MessageSizeType_Response_Data:
- case MessageSizeType_ResponseLocal_Data:
- case MessageSizeType_ResponseL2hit_Data:
- case MessageSizeType_Writeback_Data:
- return m_data_msg_size;
- break;
- default:
- ERROR_MSG("Invalid range for type MessageSizeType");
- break;
- }
- return 0;
+ switch(size_type) {
+ case MessageSizeType_Undefined:
+ ERROR_MSG("Can't convert Undefined MessageSizeType to integer");
+ break;
+ case MessageSizeType_Control:
+ case MessageSizeType_Request_Control:
+ case MessageSizeType_Reissue_Control:
+ case MessageSizeType_Response_Control:
+ case MessageSizeType_Writeback_Control:
+ case MessageSizeType_Forwarded_Control:
+ case MessageSizeType_Invalidate_Control:
+ case MessageSizeType_Unblock_Control:
+ case MessageSizeType_Persistent_Control:
+ case MessageSizeType_Completion_Control:
+ return m_control_msg_size;
+ case MessageSizeType_Data:
+ case MessageSizeType_Response_Data:
+ case MessageSizeType_ResponseLocal_Data:
+ case MessageSizeType_ResponseL2hit_Data:
+ case MessageSizeType_Writeback_Data:
+ return m_data_msg_size;
+ default:
+ ERROR_MSG("Invalid range for type MessageSizeType");
+ break;
+ }
+ return 0;
}
+
+const Vector<Throttle*>*
+Network::getThrottles(NodeID id) const
+{
+ return NULL;
+}
diff -r 28cb3b80435c -r 7d6862b80049 src/mem/ruby/network/Network.hh
--- a/src/mem/ruby/network/Network.hh Mon Mar 29 20:39:02 2010 -0400
+++ b/src/mem/ruby/network/Network.hh Wed Mar 31 16:56:45 2010 -0700
@@ -27,106 +27,96 @@
*/
/*
- * Network.hh
- *
- * Description: The Network class is the base class for classes that
- * implement the interconnection network between components
- * (processor/cache components and memory/directory components). The
- * interconnection network as described here is not a physical
- * network, but a programming concept used to implement all
- * communication between components. Thus parts of this 'network'
- * will model the on-chip connections between cache controllers and
- * directory controllers as well as the links between chip and network
- * switches.
- *
- * $Id$
- * */
+ * The Network class is the base class for classes that implement the
+ * interconnection network between components (processor/cache
+ * components and memory/directory components). The interconnection
+ * network as described here is not a physical network, but a
+ * programming concept used to implement all communication between
+ * components. Thus parts of this 'network' will model the on-chip
+ * connections between cache controllers and directory controllers as
+ * well as the links between chip and network switches.
+ */
-#ifndef NETWORK_H
-#define NETWORK_H
+#ifndef __MEM_RUBY_NETWORK_NETWORK_HH__
+#define __MEM_RUBY_NETWORK_NETWORK_HH__
+#include "mem/protocol/MessageSizeType.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/system/NodeID.hh"
-#include "mem/protocol/MessageSizeType.hh"
#include "mem/ruby/system/System.hh"
+#include "params/RubyNetwork.hh"
#include "sim/sim_object.hh"
-#include "params/RubyNetwork.hh"
class NetDest;
class MessageBuffer;
class Throttle;
class Topology;
-class Network : public SimObject {
-public:
- // Constructors
+class Network : public SimObject
+{
+ public:
typedef RubyNetworkParams Params;
Network(const Params *p);
- virtual void init();
+ virtual ~Network() {}
- // Destructor
- virtual ~Network() {}
+ virtual void init();
- // Public Methods
- int getBufferSize() { return m_buffer_size; }
- int getNumberOfVirtualNetworks() { return m_virtual_networks; }
- int getEndpointBandwidth() { return m_endpoint_bandwidth; }
- bool getAdaptiveRouting() {return m_adaptive_routing; }
- int getLinkLatency() { return m_link_latency; }
- int MessageSizeType_to_int(MessageSizeType size_type);
+ int getBufferSize() { return m_buffer_size; }
+ int getNumberOfVirtualNetworks() { return m_virtual_networks; }
+ int getEndpointBandwidth() { return m_endpoint_bandwidth; }
+ bool getAdaptiveRouting() {return m_adaptive_routing; }
+ int getLinkLatency() { return m_link_latency; }
+ int MessageSizeType_to_int(MessageSizeType size_type);
+ // returns the queue requested for the given component
+ virtual MessageBuffer* getToNetQueue(NodeID id, bool ordered,
+ int netNumber) = 0;
+ virtual MessageBuffer* getFromNetQueue(NodeID id, bool ordered,
+ int netNumber) = 0;
+ virtual const Vector<Throttle*>* getThrottles(NodeID id) const;
+ virtual int getNumNodes() {return 1;}
- // returns the queue requested for the given component
- virtual MessageBuffer* getToNetQueue(NodeID id, bool ordered, int netNumber)
= 0;
- virtual MessageBuffer* getFromNetQueue(NodeID id, bool ordered, int
netNumber) = 0;
- virtual const Vector<Throttle*>* getThrottles(NodeID id) const { return
NULL; }
+ virtual void makeOutLink(SwitchID src, NodeID dest,
+ const NetDest& routing_table_entry, int link_latency, int link_weight,
+ int bw_multiplier, bool isReconfiguration) = 0;
+ virtual void makeInLink(SwitchID src, NodeID dest,
+ const NetDest& routing_table_entry, int link_latency,
+ int bw_multiplier, bool isReconfiguration) = 0;
+ virtual void makeInternalLink(SwitchID src, NodeID dest,
+ const NetDest& routing_table_entry, int link_latency, int link_weight,
+ int bw_multiplier, bool isReconfiguration) = 0;
- virtual int getNumNodes() {return 1;}
+ virtual void reset() = 0;
- virtual void makeOutLink(SwitchID src, NodeID dest, const NetDest&
routing_table_entry, int link_latency, int link_weight, int bw_multiplier, bool
isReconfiguration) = 0;
- virtual void makeInLink(SwitchID src, NodeID dest, const NetDest&
routing_table_entry, int link_latency, int bw_multiplier, bool
isReconfiguration) = 0;
- virtual void makeInternalLink(SwitchID src, NodeID dest, const NetDest&
routing_table_entry, int link_latency, int link_weight, int bw_multiplier, bool
isReconfiguration) = 0;
+ virtual void printStats(ostream& out) const = 0;
+ virtual void clearStats() = 0;
+ virtual void printConfig(ostream& out) const = 0;
+ virtual void print(ostream& out) const = 0;
- virtual void reset() = 0;
+ protected:
+ // Private copy constructor and assignment operator
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
