[ipgen,pwrmgr] Implement fuseoc instance_vlnv and virtual dependencies #20883
Conversation
This file contains 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
matutem
force-pushed
the
autogen_vlnv
branch
3 times, most recently
from
e348e80 to
02327a8
Compare
matutem
requested review from
hcallahan-lowrisc
and removed request for
a team
This pair is uniformly added to all ipgen modules. Change topgen.py to adopt the convention that, for example, the variable topname is just earlgrey for example, while top_name is top_earlgrey. Signed-off-by: Guillermo Maturana <[email protected]>
matutem
changed the title
a-will
reviewed
Jan 22, 2024
| @@ -39,7 +39,7 @@ filesets: | |||
| - lowrisc:top_englishbreakfast:xbar_main | |||
| - lowrisc:top_englishbreakfast:xbar_peri | |||
| - lowrisc:ip:rstmgr | |||
| - lowrisc:ip:pwrmgr | |||
| - lowrisc:ip_interfaces:pwrmgr | |||
There was a problem hiding this comment.
This should be the particular implementing core, not the virtual VLNV. It'd probably look better as lowrisc:englishbreakfast:pwrmgr, but I think our current instance_vlnv naming scheme puts it like below, right?
Suggested change
| - lowrisc:ip_interfaces:pwrmgr | |
| - lowrisc:opentitan:top_englishbreakfast_pwrmgr |
There was a problem hiding this comment.
Good catch, thanks! Fixed.
a-will
reviewed
Jan 22, 2024
sw/device/tests/autogen/BUILD
Outdated
| @@ -4,8 +4,8 @@ | |||
| # | |||
| # ------------------- W A R N I N G: A U T O - G E N E R A T E D C O D E !! -------------------# | |||
| # PLEASE DO NOT HAND-EDIT THIS FILE. IT HAS BEEN AUTO-GENERATED WITH THE FOLLOWING COMMAND: | |||
| # util/topgen.py -t hw/top_earlgrey/data/top_earlgrey.hjson | |||
| # -o hw/top_earlgrey | |||
| # util/topgen.py -t hw/top_englishbreakfast/data/top_englishbreakfast.hjson | |||
There was a problem hiding this comment.
Oops, need to redo topgen for earlgrey again :)
The core files affected are the pwrmgr cores that are templetized. All other core files referring to the the files above need to depend on the virtual name instead. Remove the redundant files for which there is a corresponding template under ip_templates. Signed-off-by: Guillermo Maturana <[email protected]>
a-will
approved these changes
Jan 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Core files that provide generated files use the fusesoc $instance_vlnv mechanism and declare a virtual name. This was overlooked in #19801.
This provides two commits:
earlgreyand top_name the correspondingtop_earlgrey.