diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-01 19:00:59 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-01 19:00:59 -0500 |
| commit | b565660c42cbf8f9ec9442cd6c0b7d488c7816af (patch) | |
| tree | aa977395b10e164190efdd5106da54a57bc23b44 /configs/common/Simulation.py | |
| parent | 8dbab9f701150cf93d33f2a21d6b556507f3d617 (diff) | |
| parent | 9ef8bf74c7ab3d34889e804cb4b1e365da090d0b (diff) | |
| download | gem5-b565660c42cbf8f9ec9442cd6c0b7d488c7816af.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops
--HG--
extra : convert_revision : c2f7398a0d14dd11108579bb243ada7420285a22
Diffstat (limited to 'configs/common/Simulation.py')
| -rw-r--r-- | configs/common/Simulation.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py index 5e9c1d339..a2b1d84d2 100644 --- a/configs/common/Simulation.py +++ b/configs/common/Simulation.py @@ -53,27 +53,27 @@ def run(options, root, testsys): if options.standard_switch: switch_cpus = [TimingSimpleCPU(defer_registration=True, cpu_id=(np+i)) for i in xrange(np)] - switch_cpus1 = [DerivO3CPU(defer_registration=True, cpu_id=(2*np+i)) + switch_cpus_1 = [DerivO3CPU(defer_registration=True, cpu_id=(2*np+i)) for i in xrange(np)] + for i in xrange(np): switch_cpus[i].system = testsys - switch_cpus1[i].system = testsys + switch_cpus_1[i].system = testsys if not m5.build_env['FULL_SYSTEM']: switch_cpus[i].workload = testsys.cpu[i].workload - switch_cpus1[i].workload = testsys.cpu[i].workload + switch_cpus_1[i].workload = testsys.cpu[i].workload switch_cpus[i].clock = testsys.cpu[0].clock - switch_cpus1[i].clock = testsys.cpu[0].clock + switch_cpus_1[i].clock = testsys.cpu[0].clock if options.caches: switch_cpus[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'), L1Cache(size = '64kB')) - switch_cpus[i].mem = testsys.physmem - switch_cpus1[i].mem = testsys.physmem switch_cpus[i].connectMemPorts(testsys.membus) + root.switch_cpus = switch_cpus - root.switch_cpus1 = switch_cpus1 + root.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_cpus1[i]) for i in xrange(np)] + switch_cpu_list1 = [(switch_cpus[i], switch_cpus_1[i]) for i in xrange(np)] m5.instantiate(root) |