4f7b3ed827
There are several parts to this PR to work towards #1349 . (1) Make RubySystem::getBlockSizeBytes non-static by providing ways to access the block size or passing the block size explicitly to classes. The main changes are: - DataBlocks must be explicitly allocated. A default ctor still exists to avoid needing to heavily modify SLICC. The size can be set using a realloc function, operator=, or copy ctor. This is handled completely transparently meaning no protocol or config changes are required. - WriteMask now requires block size to be set. This is also handled transparently by modifying the SLICC parser to identify WriteMask types and call setBlockSize(). - AbstractCacheEntry and TBE classes now require block size to be set. This is handled transparently by modifying the SLICC parser to identify these classes and call initBlockSize() which calls setBlockSize() for any DataBlock or WriteMask. - All AbstractControllers now have a pointer to RubySystem. This is assigned in SLICC generated code and requires no changes to protocol or configs. - The Ruby Message class now requires block size in all constructors. This is added to the argument list automatically by the SLICC parser. (2) Relax dependence on common functions in src/mem/ruby/common/Address.hh so that RubySystem::getBlockSizeBits is no longer static. Many classes already have a way to get block size from the previous commit, so they simply multiple by 8 to get the number of bits. For handling SLICC and reducing the number of changes, define makeCacheLine, getOffset, etc. in RubyPort and AbstractController. The only protocol changes required are to change any "RubySystem::foo()" calls with "m_ruby_system->foo()". For classes which do not have a way to get access to block size but still used makeLineAddress, getOffset, etc., the block size must be passed to that class. This requires some changes to the SimObject interface for two commonly used classes: DirectoryMemory and RubyPrefecther, resulting in user-facing API changes User-facing API changes: - DirectoryMemory and RubyPrefetcher now require the cache line size as a non-optional argument. - RubySequencer SimObjects now require RubySystem as a non-optional argument. - TesterThread in the GPU ruby tester now requires the cache line size as a non-optional argument. (3) Removes static member variables in RubySystem which control randomization, cooldown, and warmup. These are mostly used by the Ruby Network. The network classes are modified to take these former static variables as parameters which are passed to the corresponding method (e.g., enqueue, delayHead, etc.) rather than needing a RubySystem object at all. Change-Id: Ia63c2ad5cf0bf9d1cbdffba5d3a679bb4d3b1220 (4) There are two major SLICC generated static methods: getNumControllers() on each cache controller which returns the number of controllers created by the configs at run time and the functions which access this method, which are MachineType_base_count and MachineType_base_number. These need to be removed to create multiple RubySystem objects otherwise NetDest, version value, and other objects are incorrect. To remove the static requirement, MachineType_base_count and MachineType_base_number are moved to RubySystem. Any class which needs to call these methods must now have a pointer to a RubySystem. To enable that, several changes are made: - RubyRequest and Message now require a RubySystem pointer in the constructor. The pointer is passed to fields in the Message class which require a RubySystem pointer (e.g., NetDest). SLICC is modified to do this automatically. - SLICC structures may now optionally take an "implicit constructor" which can be used to call a non-default constructor for locally defined variables (e.g., temporary variables within SLICC actions). A statement such as "NetDest bcast_dest;" in SLICC will implicitly append a call to the NetDest constructor taking RubySystem, for example. - RubySystem gets passed to Ruby network objects (Network, Topology).
117 lines
4.6 KiB
Python
117 lines
4.6 KiB
Python
# Copyright (c) 2017 Jason Power
|
|
# 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.
|
|
|
|
""" This file creates a set of Ruby caches, the Ruby network, and a simple
|
|
point-to-point topology for the RubyRandomTester to use.
|
|
See Part 3 in the Learning gem5 book:
|
|
http://gem5.org/documentation/learning_gem5/part3/MSIintro
|
|
|
|
IMPORTANT: If you modify this file, it's likely that the Learning gem5 book
|
|
also needs to be updated. For now, email Jason <jason@lowepower.com>
|
|
|
|
"""
|
|
|
|
from msi_caches import (
|
|
DirController,
|
|
L1Cache,
|
|
MyNetwork,
|
|
)
|
|
|
|
from m5.defines import buildEnv
|
|
from m5.objects import *
|
|
from m5.util import fatal
|
|
|
|
|
|
class TestCacheSystem(RubySystem):
|
|
def __init__(self):
|
|
if buildEnv["PROTOCOL"] != "MSI":
|
|
fatal("This system assumes MSI from learning gem5!")
|
|
|
|
super().__init__()
|
|
|
|
def setup(self, system, tester, mem_ctrls):
|
|
"""Set up the Ruby cache subsystem. Note: This can't be done in the
|
|
constructor because many of these items require a pointer to the
|
|
ruby system (self). This causes infinite recursion in initialize()
|
|
if we do this in the __init__.
|
|
Setting up for running the RubyRandomTester is a little different
|
|
than when we're using CPUs.
|
|
"""
|
|
num_testers = tester.num_cpus
|
|
|
|
# Ruby's global network.
|
|
self.network = MyNetwork(self)
|
|
|
|
# MSI uses 3 virtual networks
|
|
self.number_of_virtual_networks = 3
|
|
self.network.number_of_virtual_networks = 3
|
|
|
|
self.controllers = [
|
|
L1Cache(system, self, self) for i in range(num_testers)
|
|
] + [DirController(self, system.mem_ranges, mem_ctrls)]
|
|
|
|
self.sequencers = [
|
|
RubySequencer(
|
|
version=i,
|
|
# I/D cache is combined and grab from ctrl
|
|
dcache=self.controllers[i].cacheMemory,
|
|
clk_domain=self.clk_domain,
|
|
ruby_system=self,
|
|
)
|
|
for i in range(num_testers)
|
|
]
|
|
|
|
for i, c in enumerate(self.controllers[0 : len(self.sequencers)]):
|
|
c.sequencer = self.sequencers[i]
|
|
|
|
self.num_of_sequencers = len(self.sequencers)
|
|
|
|
# Create the network and connect the controllers.
|
|
# NOTE: This is quite different if using Garnet!
|
|
self.network.connectControllers(self.controllers)
|
|
self.network.setup_buffers()
|
|
|
|
# Set up a proxy port for the system_port. Used for load binaries and
|
|
# other functional-only things.
|
|
self.sys_port_proxy = RubyPortProxy()
|
|
system.system_port = self.sys_port_proxy.in_ports
|
|
|
|
# Connect up the sequencers to the random tester
|
|
for seq in self.sequencers:
|
|
if seq.support_data_reqs and seq.support_inst_reqs:
|
|
tester.cpuInstDataPort = seq.in_ports
|
|
elif seq.support_data_reqs:
|
|
tester.cpuDataPort = seq.in_ports
|
|
elif seq.support_inst_reqs:
|
|
tester.cpuInstDataPort = seq.in_ports
|
|
|
|
# Do not automatically retry stalled Ruby requests
|
|
seq.no_retry_on_stall = True
|
|
|
|
# Tell each sequencer this is the ruby tester so that it
|
|
# copies the subblock back to the checker
|
|
seq.using_ruby_tester = True
|