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/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 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests/quick')

diff --git a/tests/quick/se/00.hello/test.py b/tests/quick/se/00.hello/test.py
index 000181850..c37f8415c 100644
--- a/tests/quick/se/00.hello/test.py
+++ b/tests/quick/se/00.hello/test.py
@@ -26,7 +26,7 @@
 #
 # Authors: Steve Reinhardt
 
-root.system.cpu.workload = LiveProcess(cmd = 'hello',
-                                       executable = binpath('hello'))
-if root.system.cpu.checker != NULL:
-    root.system.cpu.checker.workload = root.system.cpu.workload
+root.system.cpu[0].workload = LiveProcess(cmd = 'hello',
+                                          executable = binpath('hello'))
+if root.system.cpu[0].checker != NULL:
+    root.system.cpu[0].checker.workload = root.system.cpu[0].workload
diff --git a/tests/quick/se/01.hello-2T-smt/test.py b/tests/quick/se/01.hello-2T-smt/test.py
index 2db81da93..885de10f3 100644
--- a/tests/quick/se/01.hello-2T-smt/test.py
+++ b/tests/quick/se/01.hello-2T-smt/test.py
@@ -29,5 +29,5 @@
 process1 = LiveProcess(cmd = 'hello', executable = binpath('hello'))
 process2 = LiveProcess(cmd = 'hello', executable = binpath('hello'))
 
-root.system.cpu.workload = [process1, process2]
-root.system.cpu.numThreads = 2
+root.system.cpu[0].workload = [process1, process2]
+root.system.cpu[0].numThreads = 2
diff --git a/tests/quick/se/02.insttest/test.py b/tests/quick/se/02.insttest/test.py
index 93664fbef..23e028d25 100644
--- a/tests/quick/se/02.insttest/test.py
+++ b/tests/quick/se/02.insttest/test.py
@@ -26,5 +26,5 @@
 #
 # Authors: Ali Saidi
 
-root.system.cpu.workload = LiveProcess(cmd = 'insttest',
-                                       executable = binpath('insttest'))
+root.system.cpu[0].workload = LiveProcess(cmd = 'insttest',
+                                          executable = binpath('insttest'))
diff --git a/tests/quick/se/20.eio-short/test.py b/tests/quick/se/20.eio-short/test.py
index 67d8a582c..36a86889d 100644
--- a/tests/quick/se/20.eio-short/test.py
+++ b/tests/quick/se/20.eio-short/test.py
@@ -28,6 +28,6 @@
 
 require_sim_object("EioProcess")
 
-root.system.cpu.workload = EioProcess(file = binpath('anagram',
+root.system.cpu[0].workload = EioProcess(file = binpath('anagram',
                                                      'anagram-vshort.eio.gz'))
-root.system.cpu.max_insts_any_thread = 500000
+root.system.cpu[0].max_insts_any_thread = 500000
-- 
cgit v1.2.3