diff options
| -rw-r--r-- | configs/example/se.py | 1 | ||||
| -rw-r--r-- | src/cpu/o3/cpu_builder.cc | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/configs/example/se.py b/configs/example/se.py index 1193da004..4b3842cd1 100644 --- a/configs/example/se.py +++ b/configs/example/se.py @@ -124,6 +124,7 @@ if options.detailed: (CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options) CPUClass.clock = '2GHz' +CPUClass.numThreads = len(workloads) np = options.num_cpus diff --git a/src/cpu/o3/cpu_builder.cc b/src/cpu/o3/cpu_builder.cc index a433235a0..097dc7181 100644 --- a/src/cpu/o3/cpu_builder.cc +++ b/src/cpu/o3/cpu_builder.cc @@ -51,14 +51,17 @@ DerivO3CPUParams::create() // Full-system only supports a single thread for the moment. ThreadID actual_num_threads = 1; #else + if (workload.size() > numThreads) { + fatal("Workload Size (%i) > Max Supported Threads (%i) on This CPU", + workload.size(), numThreads); + } else if (workload.size() == 0) { + fatal("Must specify at least one workload!"); + } + // In non-full-system mode, we infer the number of threads from // the workload if it's not explicitly specified. ThreadID actual_num_threads = (numThreads >= workload.size()) ? numThreads : workload.size(); - - if (workload.size() == 0) { - fatal("Must specify at least one workload!"); - } #endif numThreads = actual_num_threads; |