[chiselsim] Better fix for CIRCT 1.66- and 1.66+ #3893
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
jackkoenig
reviewed
Mar 1, 2024
Comment on lines
139
to
142
| def maybeMoveFiles(filename: String) = try { | ||
| moveFiles(filename) | ||
| } catch { | ||
| case _ @(_: java.nio.file.NoSuchFileException | _: java.io.FileNotFoundException) => | ||
| case _: java.io.FileNotFoundException => |
There was a problem hiding this comment.
Might be a good opportunity for this to check file existence rather than catching exceptions.
There was a problem hiding this comment.
Switched to that. This was also starting to push things in the direction of this should be using java.nio.file.Path instead of strings. I then rewrote the moveFiles method to work this way while, I think, preserving the original logic.
jackkoenig
reviewed
Mar 1, 2024
jackkoenig
approved these changes
Mar 1, 2024
Change the way ChiselSim moves files to track and not move files which may be duplicated in both the default black box filelist and in the main CIRCT-produced filelist. Previously, this was working because a java.nio exception was being ignored. However, this may have been hiding bugs where the filelist was actually pointing at a file that did not exist. This commit also does some heavy cleanup of the code for moving files to only use java.nio methods as opposed to relying on doing string manipulations of paths. The logic is intended to be the exact same as before. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
722acd4 to
8f3de09
Compare
mergify bot
pushed a commit
that referenced
this pull request
Mar 1, 2024
Change the way ChiselSim moves files to track and not move files which may be duplicated in both the default black box filelist and in the main CIRCT-produced filelist. Previously, this was working because a java.nio exception was being ignored. However, this may have been hiding bugs where the filelist was actually pointing at a file that did not exist. This commit also does some heavy cleanup of the code for moving files to only use java.nio methods as opposed to relying on doing string manipulations of paths. The logic is intended to be the exact same as before. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com> (cherry picked from commit 61df8bb)
mergify bot
pushed a commit
that referenced
this pull request
Mar 1, 2024
Change the way ChiselSim moves files to track and not move files which may be duplicated in both the default black box filelist and in the main CIRCT-produced filelist. Previously, this was working because a java.nio exception was being ignored. However, this may have been hiding bugs where the filelist was actually pointing at a file that did not exist. This commit also does some heavy cleanup of the code for moving files to only use java.nio methods as opposed to relying on doing string manipulations of paths. The logic is intended to be the exact same as before. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com> (cherry picked from commit 61df8bb)
This was referenced Mar 1, 2024
chiselbot
pushed a commit
that referenced
this pull request
Mar 1, 2024
Change the way ChiselSim moves files to track and not move files which may be duplicated in both the default black box filelist and in the main CIRCT-produced filelist. Previously, this was working because a java.nio exception was being ignored. However, this may have been hiding bugs where the filelist was actually pointing at a file that did not exist. This commit also does some heavy cleanup of the code for moving files to only use java.nio methods as opposed to relying on doing string manipulations of paths. The logic is intended to be the exact same as before. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com> (cherry picked from commit 61df8bb) Co-authored-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
chiselbot
pushed a commit
that referenced
this pull request
May 2, 2024
) * [chiselsim] Better fix for CIRCT 1.66- and 1.66+ (#3893) Change the way ChiselSim moves files to track and not move files which may be duplicated in both the default black box filelist and in the main CIRCT-produced filelist. Previously, this was working because a java.nio exception was being ignored. However, this may have been hiding bugs where the filelist was actually pointing at a file that did not exist. This commit also does some heavy cleanup of the code for moving files to only use java.nio methods as opposed to relying on doing string manipulations of paths. The logic is intended to be the exact same as before. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com> (cherry picked from commit 61df8bb) * Help Scala 2.12 type inferencing with type annotations --------- Co-authored-by: Schuyler Eldridge <schuyler.eldridge@sifive.com> Co-authored-by: Jack Koenig <koenig@sifive.com>
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.
Change the way ChiselSim moves files to track and not move files which may be duplicated in both the default black box filelist and in the main CIRCT-produced filelist. Previously, this was working because a java.nio exception was being ignored. However, this may have been hiding bugs where the filelist was actually pointing at a file that did not exist.