From 24c23009980a11dfba147fb4ed93329f4dcf4c0d Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Mon, 23 Jan 2012 11:33:52 -0600 Subject: Config: Enable using O3 CPU and Ruby in SE mode --- configs/example/se.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'configs/example/se.py') diff --git a/configs/example/se.py b/configs/example/se.py index 0935a21a3..572364482 100644 --- a/configs/example/se.py +++ b/configs/example/se.py @@ -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; -- cgit v1.2.3