Config: Enable using O3 CPU and Ruby in SE mode

This commit is contained in:
Nilay Vaish 2012-01-23 11:33:52 -06:00
parent 63563c9df2
commit 24c2300998
3 changed files with 8 additions and 13 deletions

View file

@ -43,7 +43,7 @@ def setCPUClass(options):
if options.cpu_type == "timing":
class TmpClass(TimingSimpleCPU): pass
elif options.cpu_type == "detailed":
if not options.caches:
if not options.caches and not options.ruby:
print "O3 CPU must be used with caches"
sys.exit(1)
class TmpClass(DerivO3CPU): pass

View file

@ -164,20 +164,13 @@ if options.cpu_type == "detailed" or options.cpu_type == "inorder":
process += [smt_process, ]
smt_idx += 1
numThreads = len(workloads)
if options.ruby:
if options.cpu_type == "detailed":
print >> sys.stderr, "Ruby only works with TimingSimpleCPU!!"
if not (options.cpu_type == "detailed" or options.cpu_type == "timing"):
print >> sys.stderr, "Ruby requires TimingSimpleCPU or O3CPU!!"
sys.exit(1)
elif not options.cpu_type == "timing":
print >> sys.stderr, "****WARN: using Timing CPU since it's needed by Ruby"
class CPUClass(TimingSimpleCPU): pass
test_mem_mode = 'timing'
FutureClass = None
else:
(CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
(CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
CPUClass.clock = '2GHz'
CPUClass.numThreads = numThreads;

View file

@ -153,7 +153,9 @@ def create_system(options, system, piobus, dma_devices, ruby_system):
cntrl_id = cntrl_count,
directory = \
RubyDirectoryMemory(version = i,
size = dir_size),
size = dir_size,
use_map =
options.use_map),
memBuffer = mem_cntrl,
ruby_system = ruby_system)