0d32940711
This patch introduces a class hierarchy of buses, a non-coherent one, and a coherent one, splitting the existing bus functionality. By doing so it also enables further specialisation of the two types of buses. A non-coherent bus connects a number of non-snooping masters and slaves, and routes the request and response packets based on the address. The request packets issued by the master connected to a non-coherent bus could still snoop in caches attached to a coherent bus, as is the case with the I/O bus and memory bus in most system configurations. No snoops will, however, reach any master on the non-coherent bus itself. The non-coherent bus can be used as a template for modelling PCI, PCIe, and non-coherent AMBA and OCP buses, and is typically used for the I/O buses. A coherent bus connects a number of (potentially) snooping masters and slaves, and routes the request and response packets based on the address, and also forwards all requests to the snoopers and deals with the snoop responses. The coherent bus can be used as a template for modelling QPI, HyperTransport, ACE and coherent OCP buses, and is typically used for the L1-to-L2 buses and as the main system interconnect. The configuration scripts are updated to use a NoncoherentBus for all peripheral and I/O buses. A bit of minor tidying up has also been done. --HG-- rename : src/mem/bus.cc => src/mem/coherent_bus.cc rename : src/mem/bus.hh => src/mem/coherent_bus.hh rename : src/mem/bus.cc => src/mem/noncoherent_bus.cc rename : src/mem/bus.hh => src/mem/noncoherent_bus.hh
201 lines
6.8 KiB
Python
201 lines
6.8 KiB
Python
# Copyright (c) 2012 ARM Limited
|
|
# All rights reserved.
|
|
#
|
|
# The license below extends only to copyright in the software and shall
|
|
# not be construed as granting a license to any other intellectual
|
|
# property including but not limited to intellectual property relating
|
|
# to a hardware implementation of the functionality of the software
|
|
# licensed hereunder. You may use the software subject to the license
|
|
# terms below provided that you ensure that this notice is replicated
|
|
# unmodified and in its entirety in all distributions of the software,
|
|
# modified or unmodified, in source code or in binary form.
|
|
#
|
|
# Copyright (c) 2006-2008 The Regents of The University of Michigan
|
|
# 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: Steve Reinhardt
|
|
|
|
# Simple test script
|
|
#
|
|
# "m5 test.py"
|
|
|
|
import optparse
|
|
import sys
|
|
|
|
import m5
|
|
from m5.defines import buildEnv
|
|
from m5.objects import *
|
|
from m5.util import addToPath, fatal
|
|
|
|
addToPath('../common')
|
|
addToPath('../ruby')
|
|
|
|
import Options
|
|
import Ruby
|
|
import Simulation
|
|
import CacheConfig
|
|
from Caches import *
|
|
from cpu2000 import *
|
|
|
|
parser = optparse.OptionParser()
|
|
Options.addCommonOptions(parser)
|
|
Options.addSEOptions(parser)
|
|
|
|
if '--ruby' in sys.argv:
|
|
Ruby.define_options(parser)
|
|
|
|
(options, args) = parser.parse_args()
|
|
|
|
if args:
|
|
print "Error: script doesn't take any positional arguments"
|
|
sys.exit(1)
|
|
|
|
multiprocesses = []
|
|
apps = []
|
|
|
|
if options.bench:
|
|
apps = options.bench.split("-")
|
|
if len(apps) != options.num_cpus:
|
|
print "number of benchmarks not equal to set num_cpus!"
|
|
sys.exit(1)
|
|
|
|
for app in apps:
|
|
try:
|
|
if buildEnv['TARGET_ISA'] == 'alpha':
|
|
exec("workload = %s('alpha', 'tru64', 'ref')" % app)
|
|
else:
|
|
exec("workload = %s(buildEnv['TARGET_ISA'], 'linux', 'ref')" % app)
|
|
multiprocesses.append(workload.makeLiveProcess())
|
|
except:
|
|
print >>sys.stderr, "Unable to find workload for %s: %s" % (buildEnv['TARGET_ISA'], app)
|
|
sys.exit(1)
|
|
elif options.cmd:
|
|
process = LiveProcess()
|
|
process.executable = options.cmd
|
|
process.cmd = [options.cmd] + options.options.split()
|
|
multiprocesses.append(process)
|
|
else:
|
|
print >> sys.stderr, "No workload specified. Exiting!\n"
|
|
sys.exit(1)
|
|
|
|
|
|
if options.input != "":
|
|
process.input = options.input
|
|
if options.output != "":
|
|
process.output = options.output
|
|
if options.errout != "":
|
|
process.errout = options.errout
|
|
|
|
|
|
# By default, set workload to path of user-specified binary
|
|
workloads = options.cmd
|
|
numThreads = 1
|
|
|
|
if options.cpu_type == "detailed" or options.cpu_type == "inorder":
|
|
#check for SMT workload
|
|
workloads = options.cmd.split(';')
|
|
if len(workloads) > 1:
|
|
process = []
|
|
smt_idx = 0
|
|
inputs = []
|
|
outputs = []
|
|
errouts = []
|
|
|
|
if options.input != "":
|
|
inputs = options.input.split(';')
|
|
if options.output != "":
|
|
outputs = options.output.split(';')
|
|
if options.errout != "":
|
|
errouts = options.errout.split(';')
|
|
|
|
for wrkld in workloads:
|
|
smt_process = LiveProcess()
|
|
smt_process.executable = wrkld
|
|
smt_process.cmd = wrkld + " " + options.options
|
|
if inputs and inputs[smt_idx]:
|
|
smt_process.input = inputs[smt_idx]
|
|
if outputs and outputs[smt_idx]:
|
|
smt_process.output = outputs[smt_idx]
|
|
if errouts and errouts[smt_idx]:
|
|
smt_process.errout = errouts[smt_idx]
|
|
process += [smt_process, ]
|
|
smt_idx += 1
|
|
numThreads = len(workloads)
|
|
|
|
(CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
|
|
CPUClass.clock = '2GHz'
|
|
CPUClass.numThreads = numThreads;
|
|
|
|
np = options.num_cpus
|
|
|
|
system = System(cpu = [CPUClass(cpu_id=i) for i in xrange(np)],
|
|
physmem = SimpleMemory(range=AddrRange("512MB")),
|
|
membus = CoherentBus(), mem_mode = test_mem_mode)
|
|
|
|
# Sanity check
|
|
if options.fastmem and (options.caches or options.l2cache):
|
|
fatal("You cannot use fastmem in combination with caches!")
|
|
|
|
for i in xrange(np):
|
|
if len(multiprocesses) == 1:
|
|
system.cpu[i].workload = multiprocesses[0]
|
|
else:
|
|
system.cpu[i].workload = multiprocesses[i]
|
|
|
|
if options.fastmem:
|
|
system.cpu[i].fastmem = True
|
|
|
|
if options.checker:
|
|
system.cpu[i].addCheckerCpu()
|
|
|
|
if options.ruby:
|
|
if not (options.cpu_type == "detailed" or options.cpu_type == "timing"):
|
|
print >> sys.stderr, "Ruby requires TimingSimpleCPU or O3CPU!!"
|
|
sys.exit(1)
|
|
|
|
options.use_map = True
|
|
Ruby.create_system(options, system)
|
|
assert(options.num_cpus == len(system.ruby._cpu_ruby_ports))
|
|
|
|
for i in xrange(np):
|
|
ruby_port = system.ruby._cpu_ruby_ports[i]
|
|
|
|
# Create the interrupt controller and connect its ports to Ruby
|
|
system.cpu[i].createInterruptController()
|
|
system.cpu[i].interrupts.pio = ruby_port.master
|
|
system.cpu[i].interrupts.int_master = ruby_port.slave
|
|
system.cpu[i].interrupts.int_slave = ruby_port.master
|
|
|
|
# Connect the cpu's cache ports to Ruby
|
|
system.cpu[i].icache_port = ruby_port.slave
|
|
system.cpu[i].dcache_port = ruby_port.slave
|
|
else:
|
|
system.system_port = system.membus.slave
|
|
system.physmem.port = system.membus.master
|
|
CacheConfig.config_cache(options, system)
|
|
|
|
root = Root(full_system = False, system = system)
|
|
Simulation.run(options, root, system, FutureClass)
|