changeset c02004c2cc5b in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=c02004c2cc5b
description:
config: Add a BaseSESystem builder for re-use in regressions
This patch extends the existing system builders to also include a
syscall-emulation builder. This builder is deployed in all
syscall-emulation regressions that do not involve Ruby,
i.e. o3-timing, simple-timing and simple-atomic, as well as the
multi-processor regressions o3-timing-mp, simple-timing-mp and
simple-atomic-mp (the latter are only used by SPARC at this point).
The values chosen for the cache sizes match those that were used in
the existing config scripts (despite being on the large
side). Similarly, a mem_class parameter is added to the builder base
class to enable simple-atomic to use SimpleMemory and o3-timing to use
the default DDR3 configuration.
Due to the different order the ports are connected, the bus stats get
shuffled around for the multi-processor regressions. A separate patch
bumps the port indices. Besides this, all behaviour is exactly the
same.
diffstat:
tests/configs/base_config.py | 55 ++++++++++++++++++++++++-
tests/configs/inorder-timing.py | 39 +++++++----------
tests/configs/o3-timing-checker.py | 34 +++------------
tests/configs/o3-timing-mp.py | 61 +++++++---------------------
tests/configs/o3-timing.py | 41 +++++++-----------
tests/configs/simple-atomic-dummychecker.py | 23 +++-------
tests/configs/simple-atomic-mp.py | 57 +++++++-------------------
tests/configs/simple-atomic.py | 30 +++++++------
tests/configs/simple-timing-mp.py | 56 +++++++-------------------
tests/configs/simple-timing.py | 37 +++++++---------
tests/long/se/10.mcf/test.py | 2 +-
tests/long/se/20.parser/test.py | 2 +-
tests/long/se/30.eon/test.py | 2 +-
tests/long/se/40.perlbmk/test.py | 2 +-
tests/long/se/50.vortex/test.py | 2 +-
tests/long/se/60.bzip2/test.py | 2 +-
tests/long/se/70.twolf/test.py | 4 +-
tests/quick/se/00.hello/test.py | 8 +-
tests/quick/se/01.hello-2T-smt/test.py | 4 +-
tests/quick/se/02.insttest/test.py | 4 +-
tests/quick/se/20.eio-short/test.py | 4 +-
21 files changed, 195 insertions(+), 274 deletions(-)
diffs (truncated from 716 to 300 lines):
diff -r 39c75548bcd4 -r c02004c2cc5b tests/configs/base_config.py
--- a/tests/configs/base_config.py Thu Jun 27 05:49:49 2013 -0400
+++ b/tests/configs/base_config.py Thu Jun 27 05:49:49 2013 -0400
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012-2013 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -34,6 +34,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Authors: Andreas Sandberg
+# Andreas Hansson
from abc import ABCMeta, abstractmethod
import m5
@@ -56,17 +57,19 @@
__metaclass__ = ABCMeta
- def __init__(self, mem_mode='timing', cpu_class=TimingSimpleCPU,
- num_cpus=1, checker=False):
- """Initialize a simple ARM system.
+ def __init__(self, mem_mode='timing', mem_class=SimpleMemory,
+ cpu_class=TimingSimpleCPU, num_cpus=1, checker=False):
+ """Initialize a simple base system.
Keyword Arguments:
mem_mode -- String describing the memory mode (timing or atomic)
+ mem_class -- Memory controller class to use
cpu_class -- CPU class to use
num_cpus -- Number of CPUs to instantiate
checker -- Set to True to add checker CPUs
"""
self.mem_mode = mem_mode
+ self.mem_class = mem_class
self.cpu_class = cpu_class
self.num_cpus = num_cpus
self.checker = checker
@@ -153,6 +156,50 @@
defined by this class."""
pass
+class BaseSESystem(BaseSystem):
+ """Basic syscall-emulation builder."""
+
+ def __init__(self, **kwargs):
+ BaseSystem.__init__(self, **kwargs)
+
+ def init_system(self, system):
+ BaseSystem.init_system(self, system)
+
+ def create_system(self):
+ system = System(physmem = self.mem_class(),
+ membus = CoherentBus(),
+ mem_mode = self.mem_mode)
+ system.system_port = system.membus.slave
+ system.physmem.port = system.membus.master
+ self.init_system(system)
+ return system
+
+ def create_root(self):
+ system = self.create_system()
+ m5.ticks.setGlobalFrequency('1THz')
+ return Root(full_system=False, system=system)
+
+class BaseSESystemUniprocessor(BaseSESystem):
+ """Basic syscall-emulation builder for uniprocessor systems.
+
+ Note: This class is only really needed to provide backwards
+ compatibility in existing test cases.
+ """
+
+ def __init__(self, **kwargs):
+ BaseSESystem.__init__(self, **kwargs)
+
+ def create_caches_private(self, cpu):
+ # The atomic SE configurations do not use caches
+ if self.mem_mode == "timing":
+ # @todo We might want to revisit these rather enthusiastic L1 sizes
+ cpu.addTwoLevelCacheHierarchy(L1Cache(size='128kB'),
+ L1Cache(size='256kB'),
+ L2Cache(size='2MB'))
+
+ def create_caches_shared(self, system):
+ return None
+
class BaseFSSystem(BaseSystem):
"""Basic full system builder."""
diff -r 39c75548bcd4 -r c02004c2cc5b tests/configs/inorder-timing.py
--- a/tests/configs/inorder-timing.py Thu Jun 27 05:49:49 2013 -0400
+++ b/tests/configs/inorder-timing.py Thu Jun 27 05:49:49 2013 -0400
@@ -1,3 +1,15 @@
+# Copyright (c) 2013 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-2007 The Regents of The University of Michigan
# All rights reserved.
#
@@ -24,29 +36,10 @@
# (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
+# Authors: Andreas Hansson
-import m5
from m5.objects import *
-m5.util.addToPath('../configs/common')
-from Caches import *
+from base_config import *
-cpu = InOrderCPU(cpu_id=0)
-cpu.addTwoLevelCacheHierarchy(L1Cache(size = '128kB'),
- L1Cache(size = '256kB'),
- L2Cache(size = '2MB'))
-
-cpu.clock = '2GHz'
-
-system = System(cpu = cpu,
- physmem = DDR3_1600_x64(),
- membus = CoherentBus(),
- mem_mode = "timing")
-system.clock = '1GHz'
-system.system_port = system.membus.slave
-system.physmem.port = system.membus.master
-# create the interrupt controller
-cpu.createInterruptController()
-cpu.connectAllPorts(system.membus)
-
-root = Root(full_system = False, system = system)
+root = BaseSESystemUniprocessor(mem_mode='timing', mem_class=DDR3_1600_x64,
+ cpu_class=InOrderCPU).create_root()
diff -r 39c75548bcd4 -r c02004c2cc5b tests/configs/o3-timing-checker.py
--- a/tests/configs/o3-timing-checker.py Thu Jun 27 05:49:49 2013 -0400
+++ b/tests/configs/o3-timing-checker.py Thu Jun 27 05:49:49 2013 -0400
@@ -1,5 +1,5 @@
-# Copyright (c) 2011 ARM Limited
-# All rights reserved
+# Copyright (c) 2013 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
@@ -33,31 +33,11 @@
# (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: Geoffrey Blake
+# Authors: Andreas Hansson
-import m5
from m5.objects import *
-m5.util.addToPath('../configs/common')
-from Caches import *
+from base_config import *
-cpu = DerivO3CPU(cpu_id=0)
-cpu.createInterruptController()
-cpu.addCheckerCpu()
-cpu.addTwoLevelCacheHierarchy(L1Cache(size = '128kB'),
- L1Cache(size = '256kB'),
- L2Cache(size = '2MB'))
-# @todo Note that the L2 latency here is unmodified and 2 cycles,
-# should set hit latency and response latency to 20 cycles as for
-# other scripts
-cpu.clock = '2GHz'
-
-system = System(cpu = cpu,
- physmem = DDR3_1600_x64(),
- membus = CoherentBus(),
- mem_mode = "timing")
-system.clock = '1GHz'
-system.system_port = system.membus.slave
-system.physmem.port = system.membus.master
-cpu.connectAllPorts(system.membus)
-
-root = Root(full_system = False, system = system)
+root = BaseSESystemUniprocessor(mem_mode='timing', mem_class=DDR3_1600_x64,
+ cpu_class=DerivO3CPU,
+ checker=True).create_root()
diff -r 39c75548bcd4 -r c02004c2cc5b tests/configs/o3-timing-mp.py
--- a/tests/configs/o3-timing-mp.py Thu Jun 27 05:49:49 2013 -0400
+++ b/tests/configs/o3-timing-mp.py Thu Jun 27 05:49:49 2013 -0400
@@ -1,3 +1,15 @@
+# Copyright (c) 2013 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-2007 The Regents of The University of Michigan
# All rights reserved.
#
@@ -24,52 +36,11 @@
# (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: Ron Dreslinski
+# Authors: Andreas Hansson
-import m5
from m5.objects import *
-m5.util.addToPath('../configs/common')
-from Caches import *
+from base_config import *
nb_cores = 4
-cpus = [ DerivO3CPU(cpu_id=i) for i in xrange(nb_cores) ]
-
-# system simulated
-system = System(cpu = cpus,
- physmem = DDR3_1600_x64(),
- membus = CoherentBus(),
- mem_mode = "timing")
-system.clock = '1GHz'
-
-# l2cache & bus
-system.toL2Bus = CoherentBus(clock = '2GHz')
-system.l2c = L2Cache(clock = '2GHz', size='4MB', assoc=8)
-system.l2c.cpu_side = system.toL2Bus.master
-
-# connect l2c to membus
-system.l2c.mem_side = system.membus.slave
-
-# add L1 caches
-for cpu in cpus:
- cpu.addPrivateSplitL1Caches(L1Cache(size = '32kB', assoc = 1),
- L1Cache(size = '32kB', assoc = 4))
- # create the interrupt controller
- cpu.createInterruptController()
- # connect cpu level-1 caches to shared level-2 cache
- cpu.connectAllPorts(system.toL2Bus, system.membus)
- cpu.clock = '2GHz'
-
-# connect memory to membus
-system.physmem.port = system.membus.master
-
-# connect system port to membus
-system.system_port = system.membus.slave
-
-# -----------------------
-# run simulation
-# -----------------------
-
-root = Root( full_system = False, system = system )
-root.system.mem_mode = 'timing'
-#root.trace.flags="Bus Cache"
-#root.trace.flags = "BusAddrRanges"
+root = BaseSESystem(mem_mode='timing', mem_class=DDR3_1600_x64,
+ cpu_class=DerivO3CPU, num_cpus=nb_cores).create_root()
diff -r 39c75548bcd4 -r c02004c2cc5b tests/configs/o3-timing.py
--- a/tests/configs/o3-timing.py Thu Jun 27 05:49:49 2013 -0400
+++ b/tests/configs/o3-timing.py Thu Jun 27 05:49:49 2013 -0400
@@ -1,3 +1,15 @@
+# Copyright (c) 2013 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-2007 The Regents of The University of Michigan
# All rights reserved.
#
@@ -24,31 +36,10 @@
# (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
+# Authors: Andreas Hansson
-import m5
from m5.objects import *
-m5.util.addToPath('../configs/common')
-from Caches import *
+from base_config import *
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
