configs, tests: Replace optparse with argparse
JIRA: https://gem5.atlassian.net/browse/GEM5-543 Change-Id: I997d6a4e45319a74e21bd0d61d4af6118474c849 Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44513 Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br> Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
@@ -52,28 +52,20 @@ from caches import *
|
||||
# import the SimpleOpts module
|
||||
from common import SimpleOpts
|
||||
|
||||
# Set the usage message to display
|
||||
SimpleOpts.set_usage("usage: %prog [options] <binary to execute>")
|
||||
|
||||
# Finalize the arguments and grab the opts so we can pass it on to our objects
|
||||
(opts, args) = SimpleOpts.parse_args()
|
||||
|
||||
# get ISA for the default binary to run. This is mostly for simple testing
|
||||
isa = str(m5.defines.buildEnv['TARGET_ISA']).lower()
|
||||
|
||||
# Default to running 'hello', use the compiled ISA to find the binary
|
||||
# grab the specific path to the binary
|
||||
thispath = os.path.dirname(os.path.realpath(__file__))
|
||||
binary = os.path.join(thispath, '../../../',
|
||||
'tests/test-progs/hello/bin/', isa, 'linux/hello')
|
||||
default_binary = os.path.join(thispath, '../../../',
|
||||
'tests/test-progs/hello/bin/', isa, 'linux/hello')
|
||||
|
||||
# Check if there was a binary passed in via the command line and error if
|
||||
# there are too many arguments
|
||||
if len(args) == 1:
|
||||
binary = args[0]
|
||||
elif len(args) > 1:
|
||||
SimpleOpts.print_help()
|
||||
m5.fatal("Expected a binary to execute as positional argument")
|
||||
# Binary to execute
|
||||
SimpleOpts.add_option("binary", nargs='?', default=default_binary)
|
||||
|
||||
# Finalize the arguments and grab the args so we can pass it on to our objects
|
||||
args = SimpleOpts.parse_args()
|
||||
|
||||
# create the system we are going to simulate
|
||||
system = System()
|
||||
@@ -91,8 +83,8 @@ system.mem_ranges = [AddrRange('512MB')] # Create an address range
|
||||
system.cpu = TimingSimpleCPU()
|
||||
|
||||
# Create an L1 instruction and data cache
|
||||
system.cpu.icache = L1ICache(opts)
|
||||
system.cpu.dcache = L1DCache(opts)
|
||||
system.cpu.icache = L1ICache(args)
|
||||
system.cpu.dcache = L1DCache(args)
|
||||
|
||||
# Connect the instruction and data caches to the CPU
|
||||
system.cpu.icache.connectCPU(system.cpu)
|
||||
@@ -106,7 +98,7 @@ system.cpu.icache.connectBus(system.l2bus)
|
||||
system.cpu.dcache.connectBus(system.l2bus)
|
||||
|
||||
# Create an L2 cache and connect it to the l2bus
|
||||
system.l2cache = L2Cache(opts)
|
||||
system.l2cache = L2Cache(args)
|
||||
system.l2cache.connectCPUSideBus(system.l2bus)
|
||||
|
||||
# Create a memory bus
|
||||
@@ -134,13 +126,13 @@ system.mem_ctrl.dram = DDR3_1600_8x8()
|
||||
system.mem_ctrl.dram.range = system.mem_ranges[0]
|
||||
system.mem_ctrl.port = system.membus.master
|
||||
|
||||
system.workload = SEWorkload.init_compatible(binary)
|
||||
system.workload = SEWorkload.init_compatible(args.binary)
|
||||
|
||||
# Create a process for a simple "Hello World" application
|
||||
process = Process()
|
||||
# Set the command
|
||||
# cmd is a list which begins with the executable (like argv)
|
||||
process.cmd = [binary]
|
||||
process.cmd = [args.binary]
|
||||
# Set the cpu to use the process as its workload and create thread contexts
|
||||
system.cpu.workload = process
|
||||
system.cpu.createThreads()
|
||||
|
||||
Reference in New Issue
Block a user