Config: Enable O3 CPU and Ruby in FS mode

This commit is contained in:
Nilay Vaish 2012-01-28 19:33:37 -06:00
parent f19b3f30b4
commit ce336fae6a

View file

@ -82,6 +82,7 @@ Ruby.define_options(parser)
execfile(os.path.join(config_root, "common", "Options.py")) execfile(os.path.join(config_root, "common", "Options.py"))
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
options.ruby = True
if args: if args:
print "Error: script doesn't take any positional arguments" print "Error: script doesn't take any positional arguments"
@ -97,17 +98,11 @@ if options.benchmark:
else: else:
bm = [SysConfig()] bm = [SysConfig()]
# # Check for timing mode because ruby does not support atomic accesses
# currently ruby fs only works in simple timing mode because ruby does not if not (options.cpu_type == "detailed" or options.cpu_type == "timing"):
# support atomic accesses by devices. Also ruby_fs currently assumes print >> sys.stderr, "Ruby requires TimingSimpleCPU or O3CPU!!"
# that is running a checkpoints that were created by ALPHA_FS under atomic sys.exit(1)
# mode. Since switch cpus are not defined in these checkpoints, we don't (CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
# 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
CPUClass.clock = options.clock CPUClass.clock = options.clock