[chiselsim] Set +incdir on all primary sources #4923
Merged
Conversation
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
Set `+incdir` for every primary source directory. Previously, only the root primary source directory would be set. This change is done to allow for the FIRRTL ABI related to bind layers to be changed to _not_ use an FIRRTL compiler output directory-relative path for `` `include `` [[1]]. This is necessary because some flows are rearranging the directory structure of Chisel-generated Verilog, which includes layers, and paths relative to the root will break. This is a compromise between complexity of the build system, ABI simplicitly, and ease of directory manipulation. This has the effect of users with custom build flows will need to recognize that they need to set the `+incdir` recursively based on all output directories that were created. Practically, this is easy to do. [1]: llvm/circt#8474 Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
jackkoenig
approved these changes
May 12, 2025
| } | ||
|
|
||
| override def postVisitDirectory(dir: Path, ioe: java.io.IOException): FileVisitResult = { | ||
| primarySourcesDirectories += dir.toString() |
There was a problem hiding this comment.
Suggested change
| primarySourcesDirectories += dir.toString() | |
| primarySourcesDirectories += dir.toString |
Nit but I don't think the parentheses are necessary (would be an error if toString were a Scala API, but not for Java APIs).
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.
Set
+incdirfor every primary source directory. Previously, only theroot primary source directory would be set.
This change is done to allow for the FIRRTL ABI related to bind layers to
be changed to not use an FIRRTL compiler output directory-relative path
for
`include[1]. This is necessary because some flows arerearranging the directory structure of Chisel-generated Verilog, which
includes layers, and paths relative to the root will break.
This is a compromise between complexity of the build system, ABI
simplicitly, and ease of directory manipulation. This has the effect of
users with custom build flows will need to recognize that they need to set
the
+incdirrecursively based on all output directories that werecreated. Practically, this is easy to do.