diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-11-12 21:57:58 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-11-12 21:57:58 -0500 |
commit | 3052632b68f842750c767caaf310fcbf116c559f (patch) | |
tree | 9b4b05c13e5e9c964659122e85fff46a14b5e88f /configs/example | |
parent | d2d44317528ffadf81fbb95c92291d8d2d4a2190 (diff) | |
parent | 437436a2f706477439cfb81d254e8f7b454450a5 (diff) | |
download | gem5-3052632b68f842750c767caaf310fcbf116c559f.tar.xz |
Merge ktlim@zamp:./local/clean/tmp/test-regress
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix
--HG--
extra : convert_revision : b98236507bb8996ce605b48b5a5a6a7aac297dc5
Diffstat (limited to 'configs/example')
-rw-r--r-- | configs/example/fs.py | 2 | ||||
-rw-r--r-- | configs/example/se.py | 2 |
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) |