From dd53743797b2c642ef0cf720a9db5a930de2670d Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 7 Feb 2011 01:23:02 -0800 Subject: [PATCH] X86: Add scripts to support X86 FS configurations in the regressions. --- tests/SConscript | 3 + tests/configs/pc-simple-atomic.py | 114 +++++++++++++++++++++++++++++ tests/configs/pc-simple-timing.py | 116 ++++++++++++++++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 tests/configs/pc-simple-atomic.py create mode 100644 tests/configs/pc-simple-timing.py diff --git a/tests/SConscript b/tests/SConscript index a92deafbf..5d812c2eb 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -277,6 +277,9 @@ if env['FULL_SYSTEM']: if env['TARGET_ISA'] == 'arm': configs += ['realview-simple-atomic', 'realview-simple-timing'] + if env['TARGET_ISA'] == 'x86': + configs += ['pc-simple-atomic', + 'pc-simple-timing'] else: configs += ['simple-atomic', 'simple-timing', 'o3-timing', 'memtest', diff --git a/tests/configs/pc-simple-atomic.py b/tests/configs/pc-simple-atomic.py new file mode 100644 index 000000000..382899eb5 --- /dev/null +++ b/tests/configs/pc-simple-atomic.py @@ -0,0 +1,114 @@ +# Copyright (c) 2006-2007 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 + +import m5 +from m5.objects import * +m5.util.addToPath('../configs/common') +from Benchmarks import SysConfig +import FSConfig + +mem_size = '128MB' + +# -------------------- +# Base L1 Cache +# ==================== + +class L1(BaseCache): + latency = '1ns' + block_size = 64 + mshrs = 4 + tgts_per_mshr = 8 + +# ---------------------- +# Base L2 Cache +# ---------------------- + +class L2(BaseCache): + block_size = 64 + latency = '10ns' + mshrs = 92 + tgts_per_mshr = 16 + write_buffers = 8 + +# --------------------- +# Page table walker cache +# --------------------- +class PageTableWalkerCache(BaseCache): + assoc = 2 + block_size = 64 + latency = '1ns' + mshrs = 10 + size = '1kB' + tgts_per_mshr = 12 + +# --------------------- +# I/O Cache +# --------------------- +class IOCache(BaseCache): + assoc = 8 + block_size = 64 + latency = '50ns' + mshrs = 20 + size = '1kB' + tgts_per_mshr = 12 + addr_range = AddrRange(0, size=mem_size) + forward_snoops = False + +#cpu +cpu = AtomicSimpleCPU(cpu_id=0) +#the system +mdesc = SysConfig(disk = 'linux-x86.img') +system = FSConfig.makeLinuxX86System('atomic', mdesc=mdesc) +system.kernel = FSConfig.binary('x86_64-vmlinux-2.6.22.9') +system.bridge.filter_ranges_a = [AddrRange(0, Addr.max >> 4)] +system.bridge.filter_ranges_b = [AddrRange(0, size=mem_size)] +system.iocache = IOCache(addr_range=mem_size) +system.iocache.cpu_side = system.iobus.port +system.iocache.mem_side = system.membus.port + +system.cpu = cpu +#create the l1/l2 bus +system.toL2Bus = Bus() + +#connect up the l2 cache +system.l2c = L2(size='4MB', assoc=8) +system.l2c.cpu_side = system.toL2Bus.port +system.l2c.mem_side = system.membus.port + +#connect up the cpu and l1s +cpu.addPrivateSplitL1Caches(L1(size = '32kB', assoc = 1), + L1(size = '32kB', assoc = 4), + PageTableWalkerCache(), + PageTableWalkerCache()) +# connect cpu level-1 caches to shared level-2 cache +cpu.connectAllPorts(system.toL2Bus, system.membus) +cpu.clock = '2GHz' + +root = Root(system=system) +m5.ticks.setGlobalFrequency('1THz') + diff --git a/tests/configs/pc-simple-timing.py b/tests/configs/pc-simple-timing.py new file mode 100644 index 000000000..7452e2542 --- /dev/null +++ b/tests/configs/pc-simple-timing.py @@ -0,0 +1,116 @@ +# Copyright (c) 2006-2007 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 + +import m5 +from m5.objects import * +m5.util.addToPath('../configs/common') +from Benchmarks import SysConfig +import FSConfig + + +mem_size = '128MB' + +# -------------------- +# Base L1 Cache +# ==================== + +class L1(BaseCache): + latency = '1ns' + block_size = 64 + mshrs = 4 + tgts_per_mshr = 8 + +# ---------------------- +# Base L2 Cache +# ---------------------- + +class L2(BaseCache): + block_size = 64 + latency = '10ns' + mshrs = 92 + tgts_per_mshr = 16 + write_buffers = 8 + +# --------------------- +# Page table walker cache +# --------------------- +class PageTableWalkerCache(BaseCache): + assoc = 2 + block_size = 64 + latency = '1ns' + mshrs = 10 + size = '1kB' + tgts_per_mshr = 12 + +# --------------------- +# I/O Cache +# --------------------- +class IOCache(BaseCache): + assoc = 8 + block_size = 64 + latency = '50ns' + mshrs = 20 + size = '1kB' + tgts_per_mshr = 12 + addr_range = AddrRange(0, size=mem_size) + forward_snoops = False + +#cpu +cpu = TimingSimpleCPU(cpu_id=0) +#the system +mdesc = SysConfig(disk = 'linux-x86.img') +system = FSConfig.makeLinuxX86System('timing', mdesc = mdesc) +system.kernel = FSConfig.binary('x86_64-vmlinux-2.6.22.9') + +system.cpu = cpu +#create the l1/l2 bus +system.toL2Bus = Bus() +system.bridge.filter_ranges_a = [AddrRange(0, Addr.max >> 4)] +system.bridge.filter_ranges_b = [AddrRange(0, size=mem_size)] +system.iocache = IOCache(addr_range=mem_size) +system.iocache.cpu_side = system.iobus.port +system.iocache.mem_side = system.membus.port + + +#connect up the l2 cache +system.l2c = L2(size='4MB', assoc=8) +system.l2c.cpu_side = system.toL2Bus.port +system.l2c.mem_side = system.membus.port + +#connect up the cpu and l1s +cpu.addPrivateSplitL1Caches(L1(size = '32kB', assoc = 1), + L1(size = '32kB', assoc = 4), + PageTableWalkerCache(), + PageTableWalkerCache()) +# connect cpu level-1 caches to shared level-2 cache +cpu.connectAllPorts(system.toL2Bus, system.membus) +cpu.clock = '2GHz' + +root = Root(system=system) +m5.ticks.setGlobalFrequency('1THz') + -- 2.30.2