diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2012-07-23 09:32:22 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-07-23 09:32:22 -0400 |
| commit | ae6ab7c03ca719b7ab000ee62538fc71dd0cf8df (patch) | |
| tree | 699bd6ab9cd4b56345eca567ae0e94fc6060e5e6 /configs | |
| parent | 66f5124e2b7db64279f894a0694da3c75b9c157c (diff) | |
| download | gem5-ae6ab7c03ca719b7ab000ee62538fc71dd0cf8df.tar.xz | |
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.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/common/Simulation.py | 6 | ||||
| -rw-r--r-- | configs/example/fs.py | 4 | ||||
| -rw-r--r-- | configs/example/se.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py index 58da9e968..2ba691ed0 100644 --- a/configs/common/Simulation.py +++ b/configs/common/Simulation.py @@ -140,7 +140,7 @@ def run(options, root, testsys, cpu_class): testsys.cpu[i].max_insts_any_thread = int(options.fast_forward) switch_cpus[i].system = testsys 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 if 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[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_1[i].clock = testsys.cpu[0].clock + switch_cpus[i].clock = testsys.cpu[i].clock + switch_cpus_1[i].clock = testsys.cpu[i].clock # if restoring, make atomic cpu simulate only a few instructions if options.checkpoint_restore != None: diff --git a/configs/example/fs.py b/configs/example/fs.py index a6d4869f3..b0eb2f1ae 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -74,8 +74,8 @@ drive_mem_mode = 'atomic' # system under test can be any CPU (TestCPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options) -TestCPUClass.clock = '2GHz' -DriveCPUClass.clock = '2GHz' +TestCPUClass.clock = options.clock +DriveCPUClass.clock = options.clock if options.benchmark: try: diff --git a/configs/example/se.py b/configs/example/se.py index fa20c37db..009f65055 100644 --- a/configs/example/se.py +++ b/configs/example/se.py @@ -147,7 +147,7 @@ if options.cpu_type == "detailed" or options.cpu_type == "inorder": numThreads = len(workloads) (CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options) -CPUClass.clock = '2GHz' +CPUClass.clock = options.clock CPUClass.numThreads = numThreads; np = options.num_cpus |