diff options
| -rw-r--r-- | configs/learning_gem5/part1/simple.py | 7 | ||||
| -rw-r--r-- | configs/learning_gem5/part1/two_level.py | 5 | ||||
| -rw-r--r-- | configs/learning_gem5/part2/simple_cache.py | 6 | ||||
| -rw-r--r-- | configs/learning_gem5/part2/simple_memobj.py | 6 |
4 files changed, 19 insertions, 5 deletions
diff --git a/configs/learning_gem5/part1/simple.py b/configs/learning_gem5/part1/simple.py index c624de0aa..2947b7d11 100644 --- a/configs/learning_gem5/part1/simple.py +++ b/configs/learning_gem5/part1/simple.py @@ -89,8 +89,11 @@ system.system_port = system.membus.slave # get ISA for the binary to run. isa = str(m5.defines.buildEnv['TARGET_ISA']).lower() -# Run 'hello' and use the compiled ISA to find the binary -binary = 'tests/test-progs/hello/bin/' + isa + '/linux/hello' +# 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') # Create a process for a simple "Hello World" application process = Process() diff --git a/configs/learning_gem5/part1/two_level.py b/configs/learning_gem5/part1/two_level.py index b6f8781d2..dcf565a9a 100644 --- a/configs/learning_gem5/part1/two_level.py +++ b/configs/learning_gem5/part1/two_level.py @@ -67,7 +67,10 @@ SimpleOpts.set_usage("usage: %prog [options] <binary to execute>") isa = str(m5.defines.buildEnv['TARGET_ISA']).lower() # Default to running 'hello', use the compiled ISA to find the binary -binary = 'tests/test-progs/hello/bin/' + isa + '/linux/hello' +# 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') # Check if there was a binary passed in via the command line and error if # there are too many arguments diff --git a/configs/learning_gem5/part2/simple_cache.py b/configs/learning_gem5/part2/simple_cache.py index c65024233..5523b7fd4 100644 --- a/configs/learning_gem5/part2/simple_cache.py +++ b/configs/learning_gem5/part2/simple_cache.py @@ -88,8 +88,12 @@ system.system_port = system.membus.slave # Create a process for a simple "Hello World" application process = Process() # Set the command +# grab the specific path to the binary +thispath = os.path.dirname(os.path.realpath(__file__)) +binpath = os.path.join(thispath, '../../../', + 'tests/test-progs/hello/bin/x86/linux/hello') # cmd is a list which begins with the executable (like argv) -process.cmd = ['tests/test-progs/hello/bin/x86/linux/hello'] +process.cmd = [binpath] # Set the cpu to use the process as its workload and create thread contexts system.cpu.workload = process system.cpu.createThreads() diff --git a/configs/learning_gem5/part2/simple_memobj.py b/configs/learning_gem5/part2/simple_memobj.py index 24c6a24d6..b1432bd00 100644 --- a/configs/learning_gem5/part2/simple_memobj.py +++ b/configs/learning_gem5/part2/simple_memobj.py @@ -86,8 +86,12 @@ system.system_port = system.membus.slave # Create a process for a simple "Hello World" application process = Process() # Set the command +# grab the specific path to the binary +thispath = os.path.dirname(os.path.realpath(__file__)) +binpath = os.path.join(thispath, '../../../', + 'tests/test-progs/hello/bin/x86/linux/hello') # cmd is a list which begins with the executable (like argv) -process.cmd = ['tests/test-progs/hello/bin/x86/linux/hello'] +process.cmd = [binpath] # Set the cpu to use the process as its workload and create thread contexts system.cpu.workload = process system.cpu.createThreads() |