summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/common/FSConfig.py17
-rw-r--r--configs/common/Simulation.py15
-rw-r--r--configs/example/fs.py4
-rw-r--r--configs/example/ruby_fs.py2
4 files changed, 18 insertions, 20 deletions
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:
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 98e5147fc..8b27f25c1 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -133,12 +133,12 @@ elif buildEnv['TARGET_ISA'] == "sparc":
test_sys = makeSparcSystem(test_mem_mode, bm[0])
elif buildEnv['TARGET_ISA'] == "x86":
test_sys = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0])
- setWorkCountOptions(test_sys, options)
+ Simulation.setWorkCountOptions(test_sys, options)
elif buildEnv['TARGET_ISA'] == "arm":
test_sys = makeArmSystem(test_mem_mode,
options.machine_type, bm[0],
bare_metal=options.bare_metal)
- setWorkCountOptions(test_sys, options)
+ Simulation.setWorkCountOptions(test_sys, options)
else:
fatal("incapable of building non-alpha or non-sparc full system!")
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index 8de05897e..ac7587bf5 100644
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -106,7 +106,7 @@ if buildEnv['TARGET_ISA'] == "alpha":
system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0])
elif buildEnv['TARGET_ISA'] == "x86":
system = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0], True)
- setWorkCountOptions(system, options)
+ Simulation.setWorkCountOptions(system, options)
else:
fatal("incapable of building non-alpha or non-x86 full system!")