summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorAnthony Gutierrez <atgutier@umich.edu>2011-04-04 11:42:31 -0500
committerAnthony Gutierrez <atgutier@umich.edu>2011-04-04 11:42:31 -0500
commit332adcdd1a11301a229f7c70a40f6ffd1270b3bf (patch)
tree7353dbec93cebcc65d2e2e23b2ad50de171afca2 /configs
parentb20e92e1ca36486b9f01fa7df7e8cc8a87d17dcb (diff)
downloadgem5-332adcdd1a11301a229f7c70a40f6ffd1270b3bf.tar.xz
Sim: Fix Simulation.py to allow more than 1 core for standard switching.
This patch moves the assignment of testsys.switch_cpus, testsys.switch_cpus_1, switch_cpu_list, and switch_cpu_list1 outside of the for loop so they are assigned only once, after switch_cpus and switch_cpus_1 are constructed.
Diffstat (limited to 'configs')
-rw-r--r--configs/common/Simulation.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index 6d5b188db..9168e1370 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -123,6 +123,11 @@ def run(options, root, testsys, cpu_class):
switch_cpu_list = [(testsys.cpu[i], switch_cpus[i]) for i in xrange(np)]
if options.standard_switch:
+ if not options.caches:
+ # O3 CPU must have a cache to work.
+ print "O3 CPU must be used with caches"
+ sys.exit(1)
+
switch_cpus = [TimingSimpleCPU(defer_registration=True, cpu_id=(np+i))
for i in xrange(np)]
switch_cpus_1 = [DerivO3CPU(defer_registration=True, cpu_id=(2*np+i))
@@ -161,15 +166,10 @@ def run(options, root, testsys, cpu_class):
if options.max_inst:
switch_cpus_1[i].max_insts_any_thread = options.max_inst
- if not options.caches:
- # O3 CPU must have a cache to work.
- print "O3 CPU must be used with caches"
- sys.exit(1)
-
- testsys.switch_cpus = switch_cpus
- testsys.switch_cpus_1 = switch_cpus_1
- switch_cpu_list = [(testsys.cpu[i], switch_cpus[i]) for i in xrange(np)]
- switch_cpu_list1 = [(switch_cpus[i], switch_cpus_1[i]) for i in xrange(np)]
+ testsys.switch_cpus = switch_cpus
+ testsys.switch_cpus_1 = switch_cpus_1
+ switch_cpu_list = [(testsys.cpu[i], switch_cpus[i]) for i in xrange(np)]
+ switch_cpu_list1 = [(switch_cpus[i], switch_cpus_1[i]) for i in xrange(np)]
# set the checkpoint in the cpu before m5.instantiate is called
if options.take_checkpoints != None and \