changeset c1366a30d5eb in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=c1366a30d5eb
description:
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.
diffstat:
configs/common/FSConfig.py | 17 -----------------
configs/common/Simulation.py | 15 +++++++++++++++
configs/example/fs.py | 4 ++--
configs/example/ruby_fs.py | 2 +-
4 files changed, 18 insertions(+), 20 deletions(-)
diffs (82 lines):
diff -r 50d1b7dbd23c -r c1366a30d5eb configs/common/FSConfig.py
--- a/configs/common/FSConfig.py Mon Mar 26 05:37:00 2012 -0400
+++ b/configs/common/FSConfig.py Tue Mar 27 18:23:21 2012 -0500
@@ -510,23 +510,6 @@
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 -r 50d1b7dbd23c -r c1366a30d5eb configs/common/Simulation.py
--- a/configs/common/Simulation.py Mon Mar 26 05:37:00 2012 -0400
+++ b/configs/common/Simulation.py Tue Mar 27 18:23:21 2012 -0500
@@ -80,6 +80,21 @@
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 -r 50d1b7dbd23c -r c1366a30d5eb configs/example/fs.py
--- a/configs/example/fs.py Mon Mar 26 05:37:00 2012 -0400
+++ b/configs/example/fs.py Tue Mar 27 18:23:21 2012 -0500
@@ -133,12 +133,12 @@
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 -r 50d1b7dbd23c -r c1366a30d5eb configs/example/ruby_fs.py
--- a/configs/example/ruby_fs.py Mon Mar 26 05:37:00 2012 -0400
+++ b/configs/example/ruby_fs.py Tue Mar 27 18:23:21 2012 -0500
@@ -106,7 +106,7 @@
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!")
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
