summaryrefslogtreecommitdiff
path: root/configs/example
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-11-09 15:05:13 -0500
committerKevin Lim <ktlim@umich.edu>2006-11-09 15:05:13 -0500
commit0ba2cc6571f80beb3600000649403cbff0b67d8b (patch)
tree0c7e677007e197fc2b6f47fdfdff816ff660c54e /configs/example
parent21f43bfc4b01051e688a4eec4ce5aef12ad2c951 (diff)
downloadgem5-0ba2cc6571f80beb3600000649403cbff0b67d8b.tar.xz
Clean up config scripts to not have to worry about attaching a cache only to the TimingCPU. Now the Atomic CPU works with caches.
configs/common/Simulation.py: Atomic CPU now works properly with caches, so we don't have to do extra parsing to hook up caches only to the timing CPU. However the O3CPU must always use caches, so a check for that must still exist. Also change the switch_cpus to be placed at the system level, now that Steve changed how the IntrController gets its CPU. configs/example/fs.py: configs/example/se.py: Atomic CPU now handles caches. --HG-- extra : convert_revision : 534ded558ef96cafd76b4b5c5317bd8f4d05076e
Diffstat (limited to 'configs/example')
-rw-r--r--configs/example/fs.py2
-rw-r--r--configs/example/se.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 180cd2719..a9f1d579a 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -95,7 +95,7 @@ test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0])
np = options.num_cpus
test_sys.cpu = [TestCPUClass(cpu_id=i) for i in xrange(np)]
for i in xrange(np):
- if options.caches and not options.standard_switch and not FutureClass:
+ if options.caches:
test_sys.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
L1Cache(size = '64kB'))
test_sys.cpu[i].connectMemPorts(test_sys.membus)
diff --git a/configs/example/se.py b/configs/example/se.py
index 0a158244f..0944a030e 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -101,7 +101,7 @@ system = System(cpu = [CPUClass(cpu_id=i) for i in xrange(np)],
system.physmem.port = system.membus.port
for i in xrange(np):
- if options.caches and not options.standard_switch and not FutureClass:
+ if options.caches:
system.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
L1Cache(size = '64kB'))
system.cpu[i].connectMemPorts(system.membus)