[SV] Cleanup HWExportModuleHierarchyPass #5485
Merged
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
seldridge
changed the title
seldridge
force-pushed
the
dev/seldridge/export-hierarchy-cleanup
branch
from
ad0dc10
to
653112f
Compare
Cleanup the `HWExportModuleHierarchyPass` pass in the following ways: 1. Do not emit JSON directly, but rely use `sv.verbatim` operations with substitutions. 2. Move `HWExportModuleHierarchyPass` before `ExportVerilog` (again). Given that (1) is happening, this must happen. Both (1) and (2) effectively undo the work in #1931. 3. Use a `hw::ModuleNamespace` to ensure unique symbols are created for substitutions. This motivated some refactoring of the `HWExportModuleHierarchyPass` from a `struct` to a `class` since it now has private members. (This aligns with LLVM coding guidelines.) 4. Update existing tests to expect the new `sv.verbatim` JSON. 5. Add a new `firtool` end-to-end test baed on #5478. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
seldridge
force-pushed
the
dev/seldridge/export-hierarchy-cleanup
branch
from
653112f
to
4740516
Compare
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.
Cleanup the
HWExportModuleHierarchyPasspass in the following ways:Do not emit JSON directly, but rely use
sv.verbatimoperations with substitutions.Move
HWExportModuleHierarchyPassbeforeExportVerilog(again). Given that (1) is happening, this must happen. Both (1) and (2) effectively undo the work in [HWExportModuleHierarchy] Directly emit JSON to a file instead of an sv.verbatim op. #1931.Use a
hw::ModuleNamespaceto ensure unique symbols are created for substitutions. This motivated some refactoring of theHWExportModuleHierarchyPassfrom astructto aclasssince it now has private members. (This aligns with LLVM coding guidelines.)Update existing tests to expect the new
sv.verbatimJSON.Add a new
firtoolend-to-end test baed on [FIRRTL][SV] Module Hierarchy Files Not Using VerilogName #5478.