diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2011-02-07 01:22:15 -0800 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2011-02-07 01:22:15 -0800 |
commit | f8fc0419c5b1f4e20fd6886ca44626a2ca264fae (patch) | |
tree | 942490dffcf24d36d15e8fe2d978e7ec01080cb3 /configs/example | |
parent | 0c4b816d84541f832530d8a68aa51832d2a1b73f (diff) | |
download | gem5-f8fc0419c5b1f4e20fd6886ca44626a2ca264fae.tar.xz |
X86, Config: Move the setting of work count options to a separate function.
This way things that don't care about work count options and/or aren't called
by something that has those command line options set up doesn't have to build
a fake object to carry in inert values.
Diffstat (limited to 'configs/example')
-rw-r--r-- | configs/example/fs.py | 3 | ||||
-rw-r--r-- | configs/example/ruby_fs.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configs/example/fs.py b/configs/example/fs.py index a097c4138..b392f1a91 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -131,7 +131,8 @@ elif buildEnv['TARGET_ISA'] == "mips": 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, bm[0]) + test_sys = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0]) + setWorkCountOptions(test_sys, options) elif buildEnv['TARGET_ISA'] == "arm": test_sys = makeLinuxArmSystem(test_mem_mode, bm[0], bare_metal=options.bare_metal, machine_type=options.machine_type) diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py index 6f35f02cd..adc8e6147 100644 --- a/configs/example/ruby_fs.py +++ b/configs/example/ruby_fs.py @@ -116,7 +116,8 @@ if buildEnv['TARGET_ISA'] == "alpha": system.piobus, system.dma_devices) elif buildEnv['TARGET_ISA'] == "x86": - system = makeLinuxX86System(test_mem_mode, options, bm[0], True) + system = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0], True) + setWorkCountOptions(system, options) system.ruby = Ruby.create_system(options, system, system.piobus) |