changeset c38f28fad4c3 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=c38f28fad4c3
description:
ruby: remove extra whitespace and correct misspelled words
diffstat:
configs/ruby/MI_example.py | 6 ++--
configs/ruby/MOESI_CMP_directory.py | 6 ++--
configs/ruby/MOESI_CMP_token.py | 12 +++++-----
configs/ruby/MOESI_hammer.py | 4 +-
configs/ruby/Network_test.py | 4 +-
src/mem/ruby/network/MessageBuffer.hh | 2 +-
src/mem/ruby/network/Network.hh | 2 +-
src/mem/ruby/network/garnet/BaseGarnetNetwork.hh | 8 +++---
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh | 6 ++--
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc | 10 ++++----
src/mem/ruby/network/simple/SimpleNetwork.cc | 12 +++++-----
src/mem/ruby/structures/BankedArray.hh | 3 +-
src/mem/ruby/system/DMASequencer.cc | 2 +-
src/mem/ruby/system/RubyPort.cc | 4 +-
src/mem/ruby/system/Sequencer.cc | 2 +-
src/mem/ruby/system/System.cc | 10 ++++----
src/mem/slicc/symbols/StateMachine.py | 6 ++--
src/mem/slicc/symbols/Type.py | 4 +-
18 files changed, 52 insertions(+), 51 deletions(-)
diffs (truncated from 426 to 300 lines):
diff -r 5c76426fd9ee -r c38f28fad4c3 configs/ruby/MI_example.py
--- a/configs/ruby/MI_example.py Tue Jul 07 10:03:14 2015 +0100
+++ b/configs/ruby/MI_example.py Fri Jul 10 16:05:23 2015 -0500
@@ -44,12 +44,12 @@
return
def create_system(options, full_system, system, dma_ports, ruby_system):
-
+
if buildEnv['PROTOCOL'] != 'MI_example':
panic("This script requires the MI_example protocol to be built.")
cpu_sequencers = []
-
+
#
# The ruby network creation expects the list of nodes in the system to be
# consistent with the NetDest list. Therefore the l1 controller nodes
must be
@@ -143,7 +143,7 @@
#
dma_seq = DMASequencer(version = i,
ruby_system = ruby_system)
-
+
dma_cntrl = DMA_Controller(version = i,
dma_sequencer = dma_seq,
transitions_per_cycle = options.ports,
diff -r 5c76426fd9ee -r c38f28fad4c3 configs/ruby/MOESI_CMP_directory.py
--- a/configs/ruby/MOESI_CMP_directory.py Tue Jul 07 10:03:14 2015 +0100
+++ b/configs/ruby/MOESI_CMP_directory.py Fri Jul 10 16:05:23 2015 -0500
@@ -55,7 +55,7 @@
panic("This script requires the MOESI_CMP_directory protocol to be
built.")
cpu_sequencers = []
-
+
#
# The ruby network creation expects the list of nodes in the system to be
# consistent with the NetDest list. Therefore the l1 controller nodes
must be
@@ -129,7 +129,7 @@
L2cache = l2_cache,
transitions_per_cycle = options.ports,
ruby_system = ruby_system)
-
+
exec("ruby_system.l2_cntrl%d = l2_cntrl" % i)
l2_cntrl_nodes.append(l2_cntrl)
@@ -182,7 +182,7 @@
dma_seq = DMASequencer(version = i,
ruby_system = ruby_system,
slave = dma_port)
-
+
dma_cntrl = DMA_Controller(version = i,
dma_sequencer = dma_seq,
transitions_per_cycle = options.ports,
diff -r 5c76426fd9ee -r c38f28fad4c3 configs/ruby/MOESI_CMP_token.py
--- a/configs/ruby/MOESI_CMP_token.py Tue Jul 07 10:03:14 2015 +0100
+++ b/configs/ruby/MOESI_CMP_token.py Fri Jul 10 16:05:23 2015 -0500
@@ -55,9 +55,9 @@
help="Token_CMP: disable dyanimc timeouts, use fixed latency
instead")
parser.add_option("--allow-atomic-migration", action="store_true",
help="allow migratory sharing for atomic only accessed blocks")
-
+
def create_system(options, full_system, system, dma_ports, ruby_system):
-
+
if buildEnv['PROTOCOL'] != 'MOESI_CMP_token':
panic("This script requires the MOESI_CMP_token protocol to be built.")
@@ -68,7 +68,7 @@
n_tokens = options.num_cpus + 1
cpu_sequencers = []
-
+
#
# The ruby network creation expects the list of nodes in the system to be
# consistent with the NetDest list. Therefore the l1 controller nodes
must be
@@ -85,7 +85,7 @@
#
l2_bits = int(math.log(options.num_l2caches, 2))
block_size_bits = int(math.log(options.cacheline_size, 2))
-
+
for i in xrange(options.num_cpus):
#
# First create the Ruby objects associated with this cpu
@@ -153,7 +153,7 @@
N_tokens = n_tokens,
transitions_per_cycle = options.ports,
ruby_system = ruby_system)
-
+
exec("ruby_system.l2_cntrl%d = l2_cntrl" % i)
l2_cntrl_nodes.append(l2_cntrl)
@@ -212,7 +212,7 @@
dma_seq = DMASequencer(version = i,
ruby_system = ruby_system,
slave = dma_port)
-
+
dma_cntrl = DMA_Controller(version = i,
dma_sequencer = dma_seq,
transitions_per_cycle = options.ports,
diff -r 5c76426fd9ee -r c38f28fad4c3 configs/ruby/MOESI_hammer.py
--- a/configs/ruby/MOESI_hammer.py Tue Jul 07 10:03:14 2015 +0100
+++ b/configs/ruby/MOESI_hammer.py Fri Jul 10 16:05:23 2015 -0500
@@ -66,7 +66,7 @@
panic("This script requires the MOESI_hammer protocol to be built.")
cpu_sequencers = []
-
+
#
# The ruby network creation expects the list of nodes in the system to be
# consistent with the NetDest list. Therefore the l1 controller nodes
must be
@@ -209,7 +209,7 @@
dma_seq = DMASequencer(version = i,
ruby_system = ruby_system,
slave = dma_port)
-
+
dma_cntrl = DMA_Controller(version = i,
dma_sequencer = dma_seq,
transitions_per_cycle = options.ports,
diff -r 5c76426fd9ee -r c38f28fad4c3 configs/ruby/Network_test.py
--- a/configs/ruby/Network_test.py Tue Jul 07 10:03:14 2015 +0100
+++ b/configs/ruby/Network_test.py Fri Jul 10 16:05:23 2015 -0500
@@ -43,7 +43,7 @@
return
def create_system(options, full_system, system, dma_ports, ruby_system):
-
+
if buildEnv['PROTOCOL'] != 'Network_test':
panic("This script requires the Network_test protocol to be built.")
@@ -53,7 +53,7 @@
# The Garnet tester protocol does not support fs nor dma
#
assert(dma_ports == [])
-
+
#
# The ruby network creation expects the list of nodes in the system to be
# consistent with the NetDest list. Therefore the l1 controller nodes
must be
diff -r 5c76426fd9ee -r c38f28fad4c3 src/mem/ruby/network/MessageBuffer.hh
--- a/src/mem/ruby/network/MessageBuffer.hh Tue Jul 07 10:03:14 2015 +0100
+++ b/src/mem/ruby/network/MessageBuffer.hh Fri Jul 10 16:05:23 2015 -0500
@@ -180,7 +180,7 @@
Cycles m_time_last_time_size_checked;
unsigned int m_size_last_time_size_checked;
- // variables used so enqueues appear to happen imediately, while
+ // variables used so enqueues appear to happen immediately, while
// pop happen the next cycle
Cycles m_time_last_time_enqueue;
Tick m_time_last_time_pop;
diff -r 5c76426fd9ee -r c38f28fad4c3 src/mem/ruby/network/Network.hh
--- a/src/mem/ruby/network/Network.hh Tue Jul 07 10:03:14 2015 +0100
+++ b/src/mem/ruby/network/Network.hh Fri Jul 10 16:05:23 2015 -0500
@@ -61,7 +61,7 @@
typedef RubyNetworkParams Params;
Network(const Params *p);
const Params * params() const
- { return dynamic_cast<const Params *>(_params);}
+ { return dynamic_cast<const Params *>(_params); }
virtual ~Network();
virtual void init();
diff -r 5c76426fd9ee -r c38f28fad4c3
src/mem/ruby/network/garnet/BaseGarnetNetwork.hh
--- a/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh Tue Jul 07 10:03:14
2015 +0100
+++ b/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh Fri Jul 10 16:05:23
2015 -0500
@@ -41,16 +41,16 @@
#include "mem/ruby/network/fault_model/FaultModel.hh"
#include "params/BaseGarnetNetwork.hh"
-class BaseGarnetNetwork : public Network
+class BaseGarnetNetwork : public Network
{
public:
typedef BaseGarnetNetworkParams Params;
BaseGarnetNetwork(const Params *p);
void init();
- int getNiFlitSize() {return m_ni_flit_size; }
- int getVCsPerVnet() {return m_vcs_per_vnet; }
- bool isFaultModelEnabled() {return m_enable_fault_model;}
+ int getNiFlitSize() { return m_ni_flit_size; }
+ int getVCsPerVnet() { return m_vcs_per_vnet; }
+ bool isFaultModelEnabled() { return m_enable_fault_model; }
FaultModel* fault_model;
void increment_injected_flits(int vnet) { m_flits_injected[vnet]++; }
diff -r 5c76426fd9ee -r c38f28fad4c3
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh Tue Jul
07 10:03:14 2015 +0100
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh Fri Jul
10 16:05:23 2015 -0500
@@ -54,8 +54,8 @@
~GarnetNetwork_d();
void init();
- int getBuffersPerDataVC() {return m_buffers_per_data_vc; }
- int getBuffersPerCtrlVC() {return m_buffers_per_ctrl_vc; }
+ int getBuffersPerDataVC() { return m_buffers_per_data_vc; }
+ int getBuffersPerCtrlVC() { return m_buffers_per_ctrl_vc; }
void collateStats();
void regStats();
@@ -69,7 +69,7 @@
}
// Methods used by Topology to setup the network
- void makeOutLink(SwitchID src, NodeID dest, BasicLink* link,
+ void makeOutLink(SwitchID src, NodeID dest, BasicLink* link,
LinkDirection direction,
const NetDest& routing_table_entry);
void makeInLink(NodeID src, SwitchID dest, BasicLink* link,
diff -r 5c76426fd9ee -r c38f28fad4c3
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Tue Jul
07 10:03:14 2015 +0100
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Fri Jul
10 16:05:23 2015 -0500
@@ -94,8 +94,8 @@
}
void
-GarnetNetwork::makeInLink(NodeID src, SwitchID dest, BasicLink* link,
- LinkDirection direction,
+GarnetNetwork::makeInLink(NodeID src, SwitchID dest, BasicLink* link,
+ LinkDirection direction,
const NetDest& routing_table_entry)
{
assert(src < m_nodes);
@@ -110,8 +110,8 @@
}
void
-GarnetNetwork::makeOutLink(SwitchID src, NodeID dest, BasicLink* link,
- LinkDirection direction,
+GarnetNetwork::makeOutLink(SwitchID src, NodeID dest, BasicLink* link,
+ LinkDirection direction,
const NetDest& routing_table_entry)
{
assert(dest < m_nodes);
@@ -130,7 +130,7 @@
void
GarnetNetwork::makeInternalLink(SwitchID src, SwitchID dest, BasicLink* link,
- LinkDirection direction,
+ LinkDirection direction,
const NetDest& routing_table_entry)
{
GarnetIntLink* garnet_link = safe_cast<GarnetIntLink*>(link);
diff -r 5c76426fd9ee -r c38f28fad4c3
src/mem/ruby/network/simple/SimpleNetwork.cc
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc Tue Jul 07 10:03:14
2015 +0100
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc Fri Jul 10 16:05:23
2015 -0500
@@ -83,8 +83,8 @@
// From a switch to an endpoint node
void
-SimpleNetwork::makeOutLink(SwitchID src, NodeID dest, BasicLink* link,
- LinkDirection direction,
+SimpleNetwork::makeOutLink(SwitchID src, NodeID dest, BasicLink* link,
+ LinkDirection direction,
const NetDest& routing_table_entry)
{
assert(dest < m_nodes);
@@ -102,8 +102,8 @@
// From an endpoint node to a switch
void
-SimpleNetwork::makeInLink(NodeID src, SwitchID dest, BasicLink* link,
- LinkDirection direction,
+SimpleNetwork::makeInLink(NodeID src, SwitchID dest, BasicLink* link,
+ LinkDirection direction,
const NetDest& routing_table_entry)
{
assert(src < m_nodes);
@@ -112,8 +112,8 @@
// From a switch to a switch
void
-SimpleNetwork::makeInternalLink(SwitchID src, SwitchID dest, BasicLink* link,
- LinkDirection direction,
+SimpleNetwork::makeInternalLink(SwitchID src, SwitchID dest, BasicLink* link,
+ LinkDirection direction,
const NetDest& routing_table_entry)
{
// Create a set of new MessageBuffers
diff -r 5c76426fd9ee -r c38f28fad4c3 src/mem/ruby/structures/BankedArray.hh
--- a/src/mem/ruby/structures/BankedArray.hh Tue Jul 07 10:03:14 2015 +0100
+++ b/src/mem/ruby/structures/BankedArray.hh Fri Jul 10 16:05:23 2015 -0500
@@ -61,7 +61,8 @@
unsigned int mapIndexToBank(int64 idx);
public:
- BankedArray(unsigned int banks, Cycles accessLatency, unsigned int
startIndexBit);
+ BankedArray(unsigned int banks, Cycles accessLatency,
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
