From 4de3205afaac1fd11876b33675aa6f49c9632764 Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Thu, 27 Jun 2013 05:49:49 -0400
Subject: 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.
---
 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 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tests/long/se')

diff --git a/tests/long/se/10.mcf/test.py b/tests/long/se/10.mcf/test.py
index 9bd18a83f..0ea3f370d 100644
--- a/tests/long/se/10.mcf/test.py
+++ b/tests/long/se/10.mcf/test.py
@@ -30,5 +30,5 @@ m5.util.addToPath('../configs/common')
 from cpu2000 import mcf
 
 workload = mcf(isa, opsys, 'smred')
-root.system.cpu.workload = workload.makeLiveProcess()
+root.system.cpu[0].workload = workload.makeLiveProcess()
 root.system.physmem.range=AddrRange('256MB')
diff --git a/tests/long/se/20.parser/test.py b/tests/long/se/20.parser/test.py
index c96a46e60..fa72847c7 100644
--- a/tests/long/se/20.parser/test.py
+++ b/tests/long/se/20.parser/test.py
@@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common')
 from cpu2000 import parser
 
 workload = parser(isa, opsys, 'mdred')
-root.system.cpu.workload = workload.makeLiveProcess()
+root.system.cpu[0].workload = workload.makeLiveProcess()
diff --git a/tests/long/se/30.eon/test.py b/tests/long/se/30.eon/test.py
index de4d12dd8..2ad1ef429 100644
--- a/tests/long/se/30.eon/test.py
+++ b/tests/long/se/30.eon/test.py
@@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common')
 from cpu2000 import eon_cook
 
 workload = eon_cook(isa, opsys, 'mdred')
-root.system.cpu.workload = workload.makeLiveProcess()
+root.system.cpu[0].workload = workload.makeLiveProcess()
diff --git a/tests/long/se/40.perlbmk/test.py b/tests/long/se/40.perlbmk/test.py
index 8fe5d6047..74c876978 100644
--- a/tests/long/se/40.perlbmk/test.py
+++ b/tests/long/se/40.perlbmk/test.py
@@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common')
 from cpu2000 import perlbmk_makerand
 
 workload = perlbmk_makerand(isa, opsys, 'lgred')
-root.system.cpu.workload = workload.makeLiveProcess()
+root.system.cpu[0].workload = workload.makeLiveProcess()
diff --git a/tests/long/se/50.vortex/test.py b/tests/long/se/50.vortex/test.py
index 92422c234..794a11aa1 100644
--- a/tests/long/se/50.vortex/test.py
+++ b/tests/long/se/50.vortex/test.py
@@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common')
 from cpu2000 import vortex
 
 workload = vortex(isa, opsys, 'smred')
-root.system.cpu.workload = workload.makeLiveProcess()
+root.system.cpu[0].workload = workload.makeLiveProcess()
diff --git a/tests/long/se/60.bzip2/test.py b/tests/long/se/60.bzip2/test.py
index fa74d0860..c217f159c 100644
--- a/tests/long/se/60.bzip2/test.py
+++ b/tests/long/se/60.bzip2/test.py
@@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common')
 from cpu2000 import bzip2_source
 
 workload = bzip2_source(isa, opsys, 'lgred')
-root.system.cpu.workload = workload.makeLiveProcess()
+root.system.cpu[0].workload = workload.makeLiveProcess()
diff --git a/tests/long/se/70.twolf/test.py b/tests/long/se/70.twolf/test.py
index 761ec8b2e..5b99b86fa 100644
--- a/tests/long/se/70.twolf/test.py
+++ b/tests/long/se/70.twolf/test.py
@@ -31,8 +31,8 @@ from cpu2000 import twolf
 import os
 
 workload = twolf(isa, opsys, 'smred')
-root.system.cpu.workload = workload.makeLiveProcess()
-cwd = root.system.cpu.workload[0].cwd
+root.system.cpu[0].workload = workload.makeLiveProcess()
+cwd = root.system.cpu[0].workload[0].cwd
 
 #Remove two files who's presence or absence affects execution
 sav_file = os.path.join(cwd, workload.input_set + '.sav')
-- 
cgit v1.2.3