changeset 9d7c1dc54954 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=9d7c1dc54954
description:
Config: Enable O3 CPU and Ruby in FS mode
diffstat:
configs/example/ruby_fs.py | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diffs (34 lines):
diff -r 2e560ea41774 -r 9d7c1dc54954 configs/example/ruby_fs.py
--- a/configs/example/ruby_fs.py Sat Jan 28 19:09:17 2012 -0600
+++ b/configs/example/ruby_fs.py Sat Jan 28 19:33:37 2012 -0600
@@ -82,6 +82,7 @@
execfile(os.path.join(config_root, "common", "Options.py"))
(options, args) = parser.parse_args()
+options.ruby = True
if args:
print "Error: script doesn't take any positional arguments"
@@ -97,17 +98,11 @@
else:
bm = [SysConfig()]
-#
-# currently ruby fs only works in simple timing mode because ruby does not
-# support atomic accesses by devices. Also ruby_fs currently assumes
-# that is running a checkpoints that were created by ALPHA_FS under atomic
-# mode. Since switch cpus are not defined in these checkpoints, we don't
-# fast forward with the atomic cpu and instead set the FutureClass to None.
-# Therefore the cpus resolve to the correct names and unserialize correctly.
-#
-class CPUClass(TimingSimpleCPU): pass
-test_mem_mode = 'timing'
-FutureClass = None
+# Check for timing mode because ruby does not support atomic accesses
+if not (options.cpu_type == "detailed" or options.cpu_type == "timing"):
+ print >> sys.stderr, "Ruby requires TimingSimpleCPU or O3CPU!!"
+ sys.exit(1)
+(CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
CPUClass.clock = options.clock
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
