gem5: fix fs_bigLITTLE: error: unrecognized arguments: --num-cpus 1

This commit is contained in:
Ciro Santilli 六四事件 法轮功
2019-08-21 00:00:00 +00:00
parent de566df6a1
commit 398d09d5ae

2
run
View File

@@ -488,6 +488,7 @@ Extra options to append at the end of the emulator command line.
extra_emulator_args.extend(['-r', str(cpt_dirs_sorted_by_tick.index(cpt_dir) + 1)]) extra_emulator_args.extend(['-r', str(cpt_dirs_sorted_by_tick.index(cpt_dir) + 1)])
cmd.extend([ cmd.extend([
self.env['gem5_fs_file'], LF, self.env['gem5_fs_file'], LF,
'--num-cpus', str(self.env['cpus']), LF,
'--disk-image', self.env['disk_image'], LF, '--disk-image', self.env['disk_image'], LF,
'--kernel', self.env['image'], LF, '--kernel', self.env['image'], LF,
'--mem-size', memory, LF, '--mem-size', memory, LF,
@@ -573,7 +574,6 @@ Extra options to append at the end of the emulator command line.
if self.env['gdb_wait']: if self.env['gdb_wait']:
# https://stackoverflow.com/questions/49296092/how-to-make-gem5-wait-for-gdb-to-connect-to-reliably-break-at-start-kernel-of-th # https://stackoverflow.com/questions/49296092/how-to-make-gem5-wait-for-gdb-to-connect-to-reliably-break-at-start-kernel-of-th
cmd.extend(['--param', 'system.cpu[0].wait_for_remote_gdb = True', LF]) cmd.extend(['--param', 'system.cpu[0].wait_for_remote_gdb = True', LF])
cmd.extend(['--num-cpus', str(self.env['cpus']), LF])
elif self.env['emulator'] == 'qemu': elif self.env['emulator'] == 'qemu':
qemu_user_and_system_options = [ qemu_user_and_system_options = [
'-trace', 'enable={},file={}'.format(trace_type, self.env['qemu_trace_file']), LF, '-trace', 'enable={},file={}'.format(trace_type, self.env['qemu_trace_file']), LF,