diff options
| author | Brandon Potter <brandon.potter@amd.com> | 2019-05-09 16:09:01 -0400 |
|---|---|---|
| committer | Brandon Potter <Brandon.Potter@amd.com> | 2019-05-10 18:52:31 +0000 |
| commit | c4bc23453133751a1a5858743e6b1266f735d3dc (patch) | |
| tree | 5b970a9df0cbff0d4f427e8576dcc59680a099ab | |
| parent | f14a6d750f5736dbe9ca9b9f7744a9688a2da119 (diff) | |
| download | gem5-c4bc23453133751a1a5858743e6b1266f735d3dc.tar.xz | |
config, sim-se: bugfix for 54c77aa0
The NULL ISA does not have some members for the options
class which are referenced by the FileSystemConfig
code.
Create default values for the members so that the
simulation does not fail during the configuration phase.
Change-Id: Ie65bf0e5550c964eae42d1df4c36c2c5bc4ea703
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18748
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Brandon Potter <Brandon.Potter@amd.com>
Tested-by: kokoro <noreply+kokoro@google.com>
| -rw-r--r-- | configs/common/FileSystemConfig.py | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/configs/common/FileSystemConfig.py b/configs/common/FileSystemConfig.py index 8a6da52e6..e37fbd3a2 100644 --- a/configs/common/FileSystemConfig.py +++ b/configs/common/FileSystemConfig.py @@ -60,6 +60,20 @@ def config_filesystem(options): procdir = joinpath(fsdir, 'proc') mkdir(procdir) + cpu_clock = '0' + if hasattr(options, 'cpu_clock'): + cpu_clock = options.cpu_clock + cpu_clock = toFrequency(cpu_clock)/mega + + l2_size = '0' + if hasattr(options, 'l2_size'): + l2_size = options.l2_size + l2_size = toMemorySize(l2_size)/kibi + + cacheline_size = '0' + if hasattr(options, 'cacheline_size'): + cacheline_size = options.cacheline_size + for i in xrange(options.num_cpus): one_cpu = 'processor : %d\n' % (i) + \ 'vendor_id : Generic\n' + \ @@ -68,9 +82,9 @@ def config_filesystem(options): 'model name : Generic\n' + \ 'stepping : 0\n' + \ 'cpu MHz : %0.3d\n' \ - % (toFrequency(options.cpu_clock)/mega) + \ + % cpu_clock + \ 'cache size: : %dK\n' \ - % (toMemorySize(options.l2_size)/kibi) + \ + % l2_size + \ 'physical id : 0\n' + \ 'siblings : %s\n' \ % options.num_cpus + \ @@ -84,7 +98,7 @@ def config_filesystem(options): 'wp : yes\n' + \ 'flags : fpu\n' + \ 'cache alignment : %d\n' \ - % options.cacheline_size + \ + % cacheline_size + \ '\n' file_append((procdir, 'cpuinfo'), one_cpu) |