-
Notifications
You must be signed in to change notification settings - Fork 52
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Spike support for block device option #300
Conversation
wlutil/launch.py
Outdated
raise ValueError("Spike does not support disk-based configurations") | ||
riscv_lib_path = os.getenv('RISCV') | ||
if not os.path.isfile(riscv_lib_path+'/lib/libspikedevices.so'): | ||
raise ValueError("Spike does not support disk-based configurations without libspikedevices.so") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
raise ValueError("Spike does not support disk-based configurations without libspikedevices.so") | |
raise ValueError("Spike does not support disk-based configurations without libspikedevices.so installed by Chipyard") |
wlutil/launch.py
Outdated
riscv_lib_path = os.getenv('RISCV') | ||
if not os.path.isfile(riscv_lib_path+'/lib/libspikedevices.so'): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If 'RISCV' doesn't exist this returns None
so the next line will break.
wlutil/launch.py
Outdated
|
||
if 'spike' in config: | ||
spikeBin = str(config['spike']) | ||
else: | ||
spikeBin = 'spike' | ||
|
||
cmd = [spikeBin, | ||
config.get('spike-args', ''), | ||
spikeArgs, # config.get('spike-args', ''), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo. You still want to append the spike-args
given by the config
' -p' + str(config['cpus']), | ||
' -m' + str(int(config['mem'] / (1024*1024)))] | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: Keep the space.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you check that the docs don't need to be updated as well (maybe just grep around for spike and see what shows up)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you check the changes?
558f9c6
to
3bbabcd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small nits. Looks good though.
Co-authored-by: Abraham Gonzalez <[email protected]>
for Spike (that binary will boot on Qemu and FireSim as well). The build process | ||
proceeds as follows: | ||
Spike, Qemu, and FireSim. Spike now supports a disk. In order to use a disk, | ||
``libspikedevices.so`` should be installed by Chipyard to the ``RISCV`` library path (i.e. ``$RISCV/lib`). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
``libspikedevices.so`` should be installed by Chipyard to the ``RISCV`` library path (i.e. ``$RISCV/lib`). | |
``libspikedevices.so`` should be installed by Chipyard to the ``RISCV`` library path (i.e. ``$RISCV/lib``). |
Support for running spike with block device option when typing "marshal launch"