68fdccb30b
This patch moves the addition of network options into the Ruby module to avoid the regressions all having to add it explicitly. Doing this exposes an issue in our current config system though, namely the fact that addtoPath is relative to the Python script being executed. Since both example and regression scripts use the Ruby module we would end up with two different (relative) paths being added. Instead we take a first step at turning the config modules into Python packages, simply by adding a __init__.py in the configs/ruby, configs/topologies and configs/network subdirectories. As a result, we can now add the top-level configs directory to the Python search path, and then use the package names in the various modules. The example scripts are also updated, and the messy path-deducing variations in the scripts are unified.
95 lines
4 KiB
Python
95 lines
4 KiB
Python
# Copyright (c) 2012 Mark D. Hill and David A. Wood
|
|
# 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: Nilay Vaish
|
|
|
|
import m5, os, optparse, sys
|
|
from m5.objects import *
|
|
m5.util.addToPath('../configs/common')
|
|
from Benchmarks import SysConfig
|
|
import FSConfig
|
|
|
|
m5.util.addToPath('../configs/')
|
|
from ruby import Ruby
|
|
import Options
|
|
|
|
# Add the ruby specific and protocol specific options
|
|
parser = optparse.OptionParser()
|
|
Options.addCommonOptions(parser)
|
|
Ruby.define_options(parser)
|
|
(options, args) = parser.parse_args()
|
|
|
|
# Set the default cache size and associativity to be very small to encourage
|
|
# races between requests and writebacks.
|
|
options.l1d_size="32kB"
|
|
options.l1i_size="32kB"
|
|
options.l2_size="4MB"
|
|
options.l1d_assoc=2
|
|
options.l1i_assoc=2
|
|
options.l2_assoc=2
|
|
options.num_cpus = 2
|
|
|
|
#the system
|
|
mdesc = SysConfig(disk = 'linux-x86.img')
|
|
system = FSConfig.makeLinuxX86System('timing', options.num_cpus,
|
|
mdesc=mdesc, Ruby=True)
|
|
# Dummy voltage domain for all our clock domains
|
|
system.voltage_domain = VoltageDomain(voltage = options.sys_voltage)
|
|
|
|
system.kernel = FSConfig.binary('x86_64-vmlinux-2.6.22.9.smp')
|
|
system.clk_domain = SrcClockDomain(clock = '1GHz',
|
|
voltage_domain = system.voltage_domain)
|
|
system.cpu_clk_domain = SrcClockDomain(clock = '2GHz',
|
|
voltage_domain = system.voltage_domain)
|
|
system.cpu = [TimingSimpleCPU(cpu_id=i, clk_domain = system.cpu_clk_domain)
|
|
for i in xrange(options.num_cpus)]
|
|
|
|
Ruby.create_system(options, True, system, system.iobus, system._dma_ports)
|
|
|
|
# Create a seperate clock domain for Ruby
|
|
system.ruby.clk_domain = SrcClockDomain(clock = options.ruby_clock,
|
|
voltage_domain = system.voltage_domain)
|
|
|
|
# Connect the ruby io port to the PIO bus,
|
|
# assuming that there is just one such port.
|
|
system.iobus.master = system.ruby._io_port.slave
|
|
|
|
for (i, cpu) in enumerate(system.cpu):
|
|
# create the interrupt controller
|
|
cpu.createInterruptController()
|
|
# Tie the cpu ports to the correct ruby system ports
|
|
cpu.icache_port = system.ruby._cpu_ports[i].slave
|
|
cpu.dcache_port = system.ruby._cpu_ports[i].slave
|
|
cpu.itb.walker.port = system.ruby._cpu_ports[i].slave
|
|
cpu.dtb.walker.port = system.ruby._cpu_ports[i].slave
|
|
|
|
cpu.interrupts[0].pio = system.ruby._cpu_ports[i].master
|
|
cpu.interrupts[0].int_master = system.ruby._cpu_ports[i].slave
|
|
cpu.interrupts[0].int_slave = system.ruby._cpu_ports[i].master
|
|
|
|
root = Root(full_system = True, system = system)
|
|
m5.ticks.setGlobalFrequency('1THz')
|