changeset cfa97c37117a in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=cfa97c37117a
description:
ruby: rename ALPHA_Network_test protocol to Garnet_standalone.
Over the past 6 years, we realized that the protocol is essentially used
to run the garnet network in a standalone manner, and feed standard
synthetic
traffic patterns through it.
diffstat:
build_opts/ALPHA_Network_test | 3 -
build_opts/Garnet_standalone | 4 +
configs/ruby/Garnet_standalone.py | 130 ++++++++++++++++
configs/ruby/Network_test.py | 130 ----------------
src/mem/protocol/Garnet_standalone-cache.sm | 217 ++++++++++++++++++++++++++++
src/mem/protocol/Garnet_standalone-dir.sm | 153 +++++++++++++++++++
src/mem/protocol/Garnet_standalone-msg.sm | 51 ++++++
src/mem/protocol/Garnet_standalone.slicc | 5 +
src/mem/protocol/Network_test-cache.sm | 213 ---------------------------
src/mem/protocol/Network_test-dir.sm | 153 -------------------
src/mem/protocol/Network_test-msg.sm | 51 ------
src/mem/protocol/Network_test.slicc | 5 -
src/mem/protocol/SConsopts | 2 +-
src/mem/ruby/system/GPUCoalescer.cc | 6 +-
src/mem/ruby/system/GPUCoalescer.hh | 2 +-
src/mem/ruby/system/Sequencer.cc | 6 +-
src/mem/ruby/system/Sequencer.hh | 2 +-
src/mem/ruby/system/Sequencer.py | 2 +-
18 files changed, 570 insertions(+), 565 deletions(-)
diffs (truncated from 1261 to 300 lines):
diff -r b29aca3fcb75 -r cfa97c37117a build_opts/ALPHA_Network_test
--- a/build_opts/ALPHA_Network_test Tue Oct 04 13:06:05 2016 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-SS_COMPATIBLE_FP = 1
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,MinorCPU'
-PROTOCOL = 'Network_test'
diff -r b29aca3fcb75 -r cfa97c37117a build_opts/Garnet_standalone
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build_opts/Garnet_standalone Thu Oct 06 14:35:14 2016 -0400
@@ -0,0 +1,4 @@
+TARGET_ISA = 'alpha'
+SS_COMPATIBLE_FP = 1
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,MinorCPU'
+PROTOCOL = 'Garnet_standalone'
diff -r b29aca3fcb75 -r cfa97c37117a configs/ruby/Garnet_standalone.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/configs/ruby/Garnet_standalone.py Thu Oct 06 14:35:14 2016 -0400
@@ -0,0 +1,130 @@
+# Copyright (c) 2009 Advanced Micro Devices, Inc.
+# Copyright (c) 2016 Georgia Institute of Technology
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Brad Beckmann
+# Tushar Krishna
+
+import m5
+from m5.objects import *
+from m5.defines import buildEnv
+from m5.util import addToPath
+from Ruby import create_topology
+
+#
+# Declare caches used by the protocol
+#
+class L1Cache(RubyCache): pass
+
+def define_options(parser):
+ return
+
+def create_system(options, full_system, system, dma_ports, ruby_system):
+ if buildEnv['PROTOCOL'] != 'Garnet_standalone':
+ panic("This script requires Garnet_standalone protocol to be built.")
+
+ cpu_sequencers = []
+
+ #
+ # The Garnet_standalone 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 listed before
+ # the directory nodes and directory nodes before dma nodes, etc.
+ l1_cntrl_nodes = []
+ dir_cntrl_nodes = []
+
+ #
+ # Must create the individual controllers before the network to ensure the
+ # controller constructors are called before the network constructor
+ #
+
+ for i in xrange(options.num_cpus):
+ #
+ # First create the Ruby objects associated with this cpu
+ # Only one cache exists for this protocol, so by default use the L1D
+ # config parameters.
+ #
+ cache = L1Cache(size = options.l1d_size,
+ assoc = options.l1d_assoc)
+
+ #
+ # Only one unified L1 cache exists. Can cache instructions and data.
+ #
+ l1_cntrl = L1Cache_Controller(version = i,
+ cacheMemory = cache,
+ ruby_system = ruby_system)
+
+ cpu_seq = RubySequencer(icache = cache,
+ dcache = cache,
+ garnet_standalone = True,
+ ruby_system = ruby_system)
+
+ l1_cntrl.sequencer = cpu_seq
+ exec("ruby_system.l1_cntrl%d = l1_cntrl" % i)
+
+ # Add controllers and sequencers to the appropriate lists
+ cpu_sequencers.append(cpu_seq)
+ l1_cntrl_nodes.append(l1_cntrl)
+
+ # Connect the L1 controllers and the network
+ l1_cntrl.mandatoryQueue = MessageBuffer()
+ l1_cntrl.requestFromCache = MessageBuffer()
+ l1_cntrl.responseFromCache = MessageBuffer()
+ l1_cntrl.forwardFromCache = MessageBuffer()
+
+
+ phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges))
+ assert(phys_mem_size % options.num_dirs == 0)
+ mem_module_size = phys_mem_size / options.num_dirs
+
+ for i in xrange(options.num_dirs):
+ dir_size = MemorySize('0B')
+ dir_size.value = mem_module_size
+
+ dir_cntrl = Directory_Controller(version = i,
+ directory = \
+ RubyDirectoryMemory(version = i,
+ size = dir_size),
+ ruby_system = ruby_system)
+
+ exec("ruby_system.dir_cntrl%d = dir_cntrl" % i)
+ dir_cntrl_nodes.append(dir_cntrl)
+
+ # Connect the directory controllers and the network
+ dir_cntrl.requestToDir = MessageBuffer()
+ dir_cntrl.forwardToDir = MessageBuffer()
+ dir_cntrl.responseToDir = MessageBuffer()
+
+
+ all_cntrls = l1_cntrl_nodes + dir_cntrl_nodes
+ ruby_system.network.number_of_virtual_networks = 3
+ topology = create_topology(all_cntrls, options)
+ return (cpu_sequencers, dir_cntrl_nodes, topology)
diff -r b29aca3fcb75 -r cfa97c37117a configs/ruby/Network_test.py
--- a/configs/ruby/Network_test.py Tue Oct 04 13:06:05 2016 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-# Copyright (c) 2006-2007 The Regents of The University of Michigan
-# Copyright (c) 2009 Advanced Micro Devices, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Brad Beckmann
-
-import m5
-from m5.objects import *
-from m5.defines import buildEnv
-from m5.util import addToPath
-from Ruby import create_topology
-
-#
-# Declare caches used by the protocol
-#
-class L1Cache(RubyCache): pass
-
-def define_options(parser):
- 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.")
-
- cpu_sequencers = []
-
- #
- # 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
- # listed before the directory nodes and directory nodes before dma nodes,
etc.
- #
- l1_cntrl_nodes = []
- dir_cntrl_nodes = []
-
- #
- # Must create the individual controllers before the network to ensure the
- # controller constructors are called before the network constructor
- #
-
- for i in xrange(options.num_cpus):
- #
- # First create the Ruby objects associated with this cpu
- # Only one cache exists for this protocol, so by default use the L1D
- # config parameters.
- #
- cache = L1Cache(size = options.l1d_size,
- assoc = options.l1d_assoc)
-
- #
- # Only one unified L1 cache exists. Can cache instructions and data.
- #
- l1_cntrl = L1Cache_Controller(version = i,
- cacheMemory = cache,
- ruby_system = ruby_system)
-
- cpu_seq = RubySequencer(icache = cache,
- dcache = cache,
- using_network_tester = True,
- ruby_system = ruby_system)
-
- l1_cntrl.sequencer = cpu_seq
- exec("ruby_system.l1_cntrl%d = l1_cntrl" % i)
-
- # Add controllers and sequencers to the appropriate lists
- cpu_sequencers.append(cpu_seq)
- l1_cntrl_nodes.append(l1_cntrl)
-
- # Connect the L1 controllers and the network
- l1_cntrl.mandatoryQueue = MessageBuffer()
- l1_cntrl.requestFromCache = MessageBuffer()
- l1_cntrl.responseFromCache = MessageBuffer()
- l1_cntrl.forwardFromCache = MessageBuffer()
-
-
- phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges))
- assert(phys_mem_size % options.num_dirs == 0)
- mem_module_size = phys_mem_size / options.num_dirs
-
- for i in xrange(options.num_dirs):
- dir_size = MemorySize('0B')
- dir_size.value = mem_module_size
-
- dir_cntrl = Directory_Controller(version = i,
- directory = \
- RubyDirectoryMemory(version = i,
- size = dir_size),
- ruby_system = ruby_system)
-
- exec("ruby_system.dir_cntrl%d = dir_cntrl" % i)
- dir_cntrl_nodes.append(dir_cntrl)
-
- # Connect the directory controllers and the network
- dir_cntrl.requestToDir = MessageBuffer()
- dir_cntrl.forwardToDir = MessageBuffer()
- dir_cntrl.responseToDir = MessageBuffer()
-
-
- all_cntrls = l1_cntrl_nodes + dir_cntrl_nodes
- ruby_system.network.number_of_virtual_networks = 3
- topology = create_topology(all_cntrls, options)
- return (cpu_sequencers, dir_cntrl_nodes, topology)
diff -r b29aca3fcb75 -r cfa97c37117a src/mem/protocol/Garnet_standalone-cache.sm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mem/protocol/Garnet_standalone-cache.sm Thu Oct 06 14:35:14
2016 -0400
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2009 Advanced Micro Devices, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
