diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/common/FSConfig.py | 104 | ||||
| -rw-r--r-- | configs/common/SysPaths.py | 68 | ||||
| -rw-r--r-- | configs/test/SysPaths.py | 40 | ||||
| -rw-r--r-- | configs/test/fs.py | 101 |
4 files changed, 192 insertions, 121 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py new file mode 100644 index 000000000..5b0de2d6d --- /dev/null +++ b/configs/common/FSConfig.py @@ -0,0 +1,104 @@ +# Copyright (c) 2006 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: Kevin Lim + +import m5 +from m5.objects import * +from FullO3Config import * +from SysPaths import * +from Util import * + +script.dir = '/z/saidi/work/m5.newmem/configs/boot' +linux_image = env.get('LINUX_IMAGE', disk('linux-latest.img')) + +class CowIdeDisk(IdeDisk): + image = CowDiskImage(child=RawDiskImage(read_only=True), + read_only=False) + + def childImage(self, ci): + self.image.child.image_file = ci + +class BaseTsunami(Tsunami): + ethernet = NSGigE(configdata=NSGigEPciData(), + pci_bus=0, pci_dev=1, pci_func=0) + etherint = NSGigEInt(device=Parent.ethernet) + ide = IdeController(disks=[Parent.disk0, Parent.disk2], + pci_func=0, pci_dev=0, pci_bus=0) + +def MyLinuxAlphaSystem(cpu, mem_mode, linux_image, icache=None, dcache=None, l2cache=None): + self = LinuxAlphaSystem() + self.iobus = Bus(bus_id=0) + self.membus = Bus(bus_id=1) + self.bridge = Bridge() + self.physmem = PhysicalMemory(range = AddrRange('128MB')) + self.bridge.side_a = self.iobus.port + self.bridge.side_b = self.membus.port + self.physmem.port = self.membus.port + self.disk0 = CowIdeDisk(driveID='master') + self.disk2 = CowIdeDisk(driveID='master') + self.disk0.childImage(linux_image) + self.disk2.childImage(disk('linux-bigswap2.img')) + self.tsunami = BaseTsunami() + self.tsunami.attachIO(self.iobus) + self.tsunami.ide.pio = self.iobus.port + self.tsunami.ide.dma = self.iobus.port + self.tsunami.ide.config = self.iobus.port + self.tsunami.ethernet.pio = self.iobus.port + self.tsunami.ethernet.dma = self.iobus.port + self.tsunami.ethernet.config = self.iobus.port + self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = linux_image, + read_only = True)) + self.intrctrl = IntrControl() + self.cpu = cpu + + connectCpu(self.cpu, self.membus, icache, dcache, l2cache) + for each_cpu in listWrapper(self.cpu): + each_cpu.itb = AlphaITB() + each_cpu.dtb = AlphaDTB() + self.cpu.clock = '2GHz' + self.sim_console = SimConsole(listener=ConsoleListener(port=3456)) + self.kernel = binary('vmlinux') + self.pal = binary('ts_osfpal') + self.console = binary('console') + self.boot_osflags = 'root=/dev/hda1 console=ttyS0' + + return self + +class TsunamiRoot(Root): + pass + +def DualRoot(clientSystem, serverSystem): + self = Root() + self.client = clientSystem + self.server = serverSystem + + self.etherdump = EtherDump(file='ethertrace') + self.etherlink = EtherLink(int1 = Parent.client.tsunami.etherint[0], + int2 = Parent.server.tsunami.etherint[0], + dump = Parent.etherdump) + self.clock = '1THz' + return self diff --git a/configs/common/SysPaths.py b/configs/common/SysPaths.py new file mode 100644 index 000000000..2070d11f8 --- /dev/null +++ b/configs/common/SysPaths.py @@ -0,0 +1,68 @@ +# Copyright (c) 2006 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: Ali Saidi + +import os, sys +from os.path import isdir, join as joinpath +from os import environ as env + +def disk(file): + system() + return joinpath(disk.dir, file) + +def binary(file): + system() + return joinpath(binary.dir, file) + +def script(file): + system() + return joinpath(script.dir, file) + +def system(): + if not system.dir: + try: + path = env['M5_PATH'].split(':') + except KeyError: + path = [ '/dist/m5/system', '/n/poolfs/z/dist/m5/system' ] + + for system.dir in path: + if os.path.isdir(system.dir): + break + else: + raise ImportError, "Can't find a path to system files." + + if not binary.dir: + binary.dir = joinpath(system.dir, 'binaries') + if not disk.dir: + disk.dir = joinpath(system.dir, 'disks') + if not script.dir: + script.dir = joinpath(system.dir, 'boot') + +system.dir = None +binary.dir = None +disk.dir = None +script.dir = None diff --git a/configs/test/SysPaths.py b/configs/test/SysPaths.py deleted file mode 100644 index 3f96a546f..000000000 --- a/configs/test/SysPaths.py +++ /dev/null @@ -1,40 +0,0 @@ -import os, sys -from os.path import isdir, join as joinpath -from os import environ as env - -def disk(file): - system() - return joinpath(disk.dir, file) - -def binary(file): - system() - return joinpath(binary.dir, file) - -def script(file): - system() - return joinpath(script.dir, file) - -def system(): - if not system.dir: - try: - path = env['M5_PATH'].split(':') - except KeyError: - path = [ '/dist/m5/system', '/n/poolfs/z/dist/m5/system' ] - - for system.dir in path: - if os.path.isdir(system.dir): - break - else: - raise ImportError, "Can't find a path to system files." - - if not binary.dir: - binary.dir = joinpath(system.dir, 'binaries') - if not disk.dir: - disk.dir = joinpath(system.dir, 'disks') - if not script.dir: - script.dir = joinpath(system.dir, 'boot') - -system.dir = None -binary.dir = None -disk.dir = None -script.dir = None diff --git a/configs/test/fs.py b/configs/test/fs.py index 7e89b7dd4..5468c5924 100644 --- a/configs/test/fs.py +++ b/configs/test/fs.py @@ -2,8 +2,10 @@ import optparse, os, sys import m5 from m5.objects import * +m5.AddToPath('../common') +from FSConfig import * from SysPaths import * -from FullO3Config import * +from Util import * parser = optparse.OptionParser() @@ -20,90 +22,27 @@ if args: print "Error: script doesn't take any positional arguments" sys.exit(1) -# Base for tests is directory containing this file. -test_base = os.path.dirname(__file__) - -script.dir = '/z/saidi/work/m5.newmem/configs/boot' - -linux_image = env.get('LINUX_IMAGE', disk('linux-latest.img')) - -class CowIdeDisk(IdeDisk): - image = CowDiskImage(child=RawDiskImage(read_only=True), - read_only=False) - - def childImage(self, ci): - self.image.child.image_file = ci - -class BaseTsunami(Tsunami): - ethernet = NSGigE(configdata=NSGigEPciData(), - pci_bus=0, pci_dev=1, pci_func=0) - etherint = NSGigEInt(device=Parent.ethernet) - ide = IdeController(disks=[Parent.disk0, Parent.disk2], - pci_func=0, pci_dev=0, pci_bus=0) - -class MyLinuxAlphaSystem(LinuxAlphaSystem): - iobus = Bus(bus_id=0) - membus = Bus(bus_id=1) - bridge = Bridge() - physmem = PhysicalMemory(range = AddrRange('128MB')) - bridge.side_a = iobus.port - bridge.side_b = membus.port - physmem.port = membus.port - disk0 = CowIdeDisk(driveID='master') - disk2 = CowIdeDisk(driveID='master') - disk0.childImage(linux_image) - disk2.childImage(disk('linux-bigswap2.img')) - tsunami = BaseTsunami() - tsunami.attachIO(iobus) - tsunami.ide.pio = iobus.port - tsunami.ide.dma = iobus.port - tsunami.ide.config = iobus.port - tsunami.ethernet.pio = iobus.port - tsunami.ethernet.dma = iobus.port - tsunami.ethernet.config = iobus.port - simple_disk = SimpleDisk(disk=RawDiskImage(image_file = linux_image, - read_only = True)) - intrctrl = IntrControl() - if options.detailed: - cpu = DetailedO3CPU() - elif options.timing: - cpu = TimingSimpleCPU() - mem_mode = 'timing' - else: - cpu = AtomicSimpleCPU() - cpu.mem = membus - cpu.icache_port = membus.port - cpu.dcache_port = membus.port - cpu.itb = AlphaITB() - cpu.dtb = AlphaDTB() - cpu.clock = '2GHz' - sim_console = SimConsole(listener=ConsoleListener(port=3456)) - kernel = binary('vmlinux') - pal = binary('ts_osfpal') - console = binary('console') - boot_osflags = 'root=/dev/hda1 console=ttyS0' - -class TsunamiRoot(Root): - pass - -def DualRoot(clientSystem, serverSystem): - self = Root() - self.client = clientSystem - self.server = serverSystem - - self.etherdump = EtherDump(file='ethertrace') - self.etherlink = EtherLink(int1 = Parent.client.tsunami.etherint[0], - int2 = Parent.server.tsunami.etherint[0], - dump = Parent.etherdump) - self.clock = '1THz' - return self +if options.detailed: + cpu = DetailedO3CPU() + cpu2 = DetailedO3CPU() + mem_mode = 'Timing' +elif options.timing: + cpu = TimingSimpleCPU() + cpu2 = TimingSimpleCPU() + mem_mode = 'Timing' +else: + cpu = AtomicSimpleCPU() + cpu2 = AtomicSimpleCPU() + mem_mode = 'Atomic' if options.dual: root = DualRoot( - MyLinuxAlphaSystem(readfile=script('netperf-stream-nt-client.rcS')), - MyLinuxAlphaSystem(readfile=script('netperf-server.rcS'))) + MyLinuxAlphaSystem(cpu, mem_mode, linux_image), + MyLinuxAlphaSystem(cpu2, mem_mode, linux_image)) + root.client.readfile = script('netperf-stream-nt-client.rcS') + root.server.readfile = script('netperf-server.rcS') else: - root = TsunamiRoot(clock = '1THz', system = MyLinuxAlphaSystem()) + root = TsunamiRoot(clock = '1THz', system = MyLinuxAlphaSystem(cpu, mem_mode, linux_image)) m5.instantiate(root) |