Workaround for empty macro issue in Riviera-PRO#681
Merged
eine merged 2 commits intoVUnit:masterfrom Sep 23, 2020
Merged
Conversation
eine
reviewed
Sep 23, 2020
vunit/sim_if/rivierapro.py
Outdated
| args += ["+incdir+%s" % include_dir] | ||
| for key, value in source_file.defines.items(): | ||
| args += ["+define+%s=%s" % (key, value)] | ||
| if value != "": |
Collaborator
There was a problem hiding this comment.
What do you think about the following?
args += ["+define+%s" % key]
if value:
args[-1] += "=%s" % valueAlso, please, run tox -e py38-fmt for getting rid of CI errors.
Contributor
Author
There was a problem hiding this comment.
I've updated code with your solution. Seems like it passes in tox tests now
Collaborator
There was a problem hiding this comment.
Yes. Errors were produced because of an indentation issue. Your code was otherwise correct too. The change was just a style preference, since it had to be edited.
Thanks!
Workaround for empty macro issue in Riviera-PRO - more elegant solution
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When you add sources and create empty macro like following:
VU.add_library("tb_uart_lib").add_source_files(SRC_PATH / "test" / "*.sv", defines={"EMPTY_MACRO" : ""})It adds to vlog command a following switch:
vlog +define+EMPTY_MACRO=However in Riviera-PRO it ends with following error:
ERROR VCP0501 "Missing option argument in command line. Option -dv requires an argument."To workaround this you need to remove '=' operator when macro has no value.