From 6ca3af8ecfa5e6fbc03b01c0eba3de9d6e2f7c45 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Tue, 27 Mar 2012 18:23:21 -0500 Subject: Config: Move setWorkCountOptions() to Simulation.py The function is presently defined in FSConfig.py, which does not seem to be the correct place for it. --- configs/common/FSConfig.py | 17 ----------------- configs/common/Simulation.py | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 17 deletions(-) (limited to 'configs/common') diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index a11061fdd..4c2d0a66c 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -510,23 +510,6 @@ def makeX86System(mem_mode, numCPUs = 1, mdesc = None, self = None, Ruby = False self.intel_mp_table.base_entries = base_entries self.intel_mp_table.ext_entries = ext_entries -def setWorkCountOptions(system, options): - if options.work_item_id != None: - system.work_item_id = options.work_item_id - if options.work_begin_cpu_id_exit != None: - system.work_begin_cpu_id_exit = options.work_begin_cpu_id_exit - if options.work_end_exit_count != None: - system.work_end_exit_count = options.work_end_exit_count - if options.work_end_checkpoint_count != None: - system.work_end_ckpt_count = options.work_end_checkpoint_count - if options.work_begin_exit_count != None: - system.work_begin_exit_count = options.work_begin_exit_count - if options.work_begin_checkpoint_count != None: - system.work_begin_ckpt_count = options.work_begin_checkpoint_count - if options.work_cpus_checkpoint_count != None: - system.work_cpus_ckpt_count = options.work_cpus_checkpoint_count - - def makeLinuxX86System(mem_mode, numCPUs = 1, mdesc = None, Ruby = False): self = LinuxX86System() diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py index b7c2c0fc0..58da9e968 100644 --- a/configs/common/Simulation.py +++ b/configs/common/Simulation.py @@ -80,6 +80,21 @@ def setCPUClass(options): return (TmpClass, test_mem_mode, CPUClass) +def setWorkCountOptions(system, options): + if options.work_item_id != None: + system.work_item_id = options.work_item_id + if options.work_begin_cpu_id_exit != None: + system.work_begin_cpu_id_exit = options.work_begin_cpu_id_exit + if options.work_end_exit_count != None: + system.work_end_exit_count = options.work_end_exit_count + if options.work_end_checkpoint_count != None: + system.work_end_ckpt_count = options.work_end_checkpoint_count + if options.work_begin_exit_count != None: + system.work_begin_exit_count = options.work_begin_exit_count + if options.work_begin_checkpoint_count != None: + system.work_begin_ckpt_count = options.work_begin_checkpoint_count + if options.work_cpus_checkpoint_count != None: + system.work_cpus_ckpt_count = options.work_cpus_checkpoint_count def run(options, root, testsys, cpu_class): if options.maxtick: -- cgit v1.2.3