Config: Use clock option in se/fs script and pass to switch_cpus
This patch changes the se and fs script to use the clock option and not simply set the CPUs clock to 2 GHz. It also makes a minor change to the assignment of the switch_cpus clock to allow different clocks.
This commit is contained in:
parent
66f5124e2b
commit
ae6ab7c03c
3 changed files with 6 additions and 6 deletions
|
@ -140,7 +140,7 @@ def run(options, root, testsys, cpu_class):
|
||||||
testsys.cpu[i].max_insts_any_thread = int(options.fast_forward)
|
testsys.cpu[i].max_insts_any_thread = int(options.fast_forward)
|
||||||
switch_cpus[i].system = testsys
|
switch_cpus[i].system = testsys
|
||||||
switch_cpus[i].workload = testsys.cpu[i].workload
|
switch_cpus[i].workload = testsys.cpu[i].workload
|
||||||
switch_cpus[i].clock = testsys.cpu[0].clock
|
switch_cpus[i].clock = testsys.cpu[i].clock
|
||||||
# simulation period
|
# simulation period
|
||||||
if options.maxinsts:
|
if options.maxinsts:
|
||||||
switch_cpus[i].max_insts_any_thread = options.maxinsts
|
switch_cpus[i].max_insts_any_thread = options.maxinsts
|
||||||
|
@ -167,8 +167,8 @@ def run(options, root, testsys, cpu_class):
|
||||||
switch_cpus_1[i].system = testsys
|
switch_cpus_1[i].system = testsys
|
||||||
switch_cpus[i].workload = testsys.cpu[i].workload
|
switch_cpus[i].workload = testsys.cpu[i].workload
|
||||||
switch_cpus_1[i].workload = testsys.cpu[i].workload
|
switch_cpus_1[i].workload = testsys.cpu[i].workload
|
||||||
switch_cpus[i].clock = testsys.cpu[0].clock
|
switch_cpus[i].clock = testsys.cpu[i].clock
|
||||||
switch_cpus_1[i].clock = testsys.cpu[0].clock
|
switch_cpus_1[i].clock = testsys.cpu[i].clock
|
||||||
|
|
||||||
# if restoring, make atomic cpu simulate only a few instructions
|
# if restoring, make atomic cpu simulate only a few instructions
|
||||||
if options.checkpoint_restore != None:
|
if options.checkpoint_restore != None:
|
||||||
|
|
|
@ -74,8 +74,8 @@ drive_mem_mode = 'atomic'
|
||||||
# system under test can be any CPU
|
# system under test can be any CPU
|
||||||
(TestCPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
|
(TestCPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
|
||||||
|
|
||||||
TestCPUClass.clock = '2GHz'
|
TestCPUClass.clock = options.clock
|
||||||
DriveCPUClass.clock = '2GHz'
|
DriveCPUClass.clock = options.clock
|
||||||
|
|
||||||
if options.benchmark:
|
if options.benchmark:
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -147,7 +147,7 @@ if options.cpu_type == "detailed" or options.cpu_type == "inorder":
|
||||||
numThreads = len(workloads)
|
numThreads = len(workloads)
|
||||||
|
|
||||||
(CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
|
(CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
|
||||||
CPUClass.clock = '2GHz'
|
CPUClass.clock = options.clock
|
||||||
CPUClass.numThreads = numThreads;
|
CPUClass.numThreads = numThreads;
|
||||||
|
|
||||||
np = options.num_cpus
|
np = options.num_cpus
|
||||||
|
|
Loading…
Reference in a new issue