summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2012-10-26 06:42:45 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2012-10-26 06:42:45 -0400
commita4d8996fd9224212ab042fd15316ba451201a11f (patch)
tree637944ac8b46e24e69262b14e375ff114c0e74cb
parent7cd01cf769fbdeec7f5e90b9b8147beb7201ddfe (diff)
downloadgem5-a4d8996fd9224212ab042fd15316ba451201a11f.tar.xz
config: Add a check for fastmem only used with Atomic CPU
This patch adds an additional check to ensure that the fastmem option is only used if the system is using the Atomic CPU.
-rw-r--r--configs/example/fs.py7
-rw-r--r--configs/example/se.py7
2 files changed, 10 insertions, 4 deletions
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 10bed7499..f1b8acedf 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -128,8 +128,11 @@ else:
test_sys.iobridge.master = test_sys.membus.slave
# Sanity check
-if options.fastmem and (options.caches or options.l2cache):
- fatal("You cannot use fastmem in combination with caches!")
+if options.fastmem:
+ if TestCPUClass != AtomicSimpleCPU:
+ fatal("Fastmem can only be used with atomic CPU!")
+ if (options.caches or options.l2cache):
+ fatal("You cannot use fastmem in combination with caches!")
for i in xrange(np):
if options.fastmem:
diff --git a/configs/example/se.py b/configs/example/se.py
index adebab1e2..c4c6daedf 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -160,8 +160,11 @@ system = System(cpu = [CPUClass(cpu_id=i) for i in xrange(np)],
membus = CoherentBus(), mem_mode = test_mem_mode)
# Sanity check
-if options.fastmem and (options.caches or options.l2cache):
- fatal("You cannot use fastmem in combination with caches!")
+if options.fastmem:
+ if CPUClass != AtomicSimpleCPU:
+ fatal("Fastmem can only be used with atomic CPU!")
+ if (options.caches or options.l2cache):
+ fatal("You cannot use fastmem in combination with caches!")
for i in xrange(np):
if options.smt: