Allow BoringUtils.bore to work on probes #3908
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
Extends BorginUtils.bore (and related) to work where the source is a probe. Currently, if a user tries to do this, they will get an error about being unable to probe a probe because the old code would unconditionally wrap whatever the source was in `Probe`/`RWProbe`. Change this to not wrap if the source is already a probe. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
dtzSiFive
approved these changes
Mar 6, 2024
| case None => purePortTypeBase | ||
| case Some(pi) => | ||
| // If the source is already a probe, don't double wrap it in a probe. | ||
| purePortTypeBase.probeInfo match { |
There was a problem hiding this comment.
Things get strange if the bore/tap target is mixed probe/non-probe, but that's already true.
(or if has incompatible probe type vs requested kind)
Not sure what the errors look like if this is wrong.
There was a problem hiding this comment.
Not something to be addressed here unless it seems easy/reasonable to address while visiting (?), just a note.
| case None if pi.writable => RWProbe(purePortTypeBase) | ||
| case None => Probe(purePortTypeBase) | ||
| } | ||
| case None => purePortTypeBase |
There was a problem hiding this comment.
Some of the below logic maybe can/should be tweaked, not sure and maybe better to defer that to a later simplification.
For example, if the target is a rwprobe port (new L251, old L246), and this is used by rwTap, it'll add another RWProbe for that. Possibly error but haven't traced all the paths here...
mergify bot
pushed a commit
that referenced
this pull request
Mar 6, 2024
Extends BorginUtils.bore (and related) to work where the source is a probe. Currently, if a user tries to do this, they will get an error about being unable to probe a probe because the old code would unconditionally wrap whatever the source was in `Probe`/`RWProbe`. Change this to not wrap if the source is already a probe. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com> (cherry picked from commit 67f51b8)
chiselbot
pushed a commit
that referenced
this pull request
Mar 6, 2024
Extends BorginUtils.bore (and related) to work where the source is a probe. Currently, if a user tries to do this, they will get an error about being unable to probe a probe because the old code would unconditionally wrap whatever the source was in `Probe`/`RWProbe`. Change this to not wrap if the source is already a probe. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com> (cherry picked from commit 67f51b8) Co-authored-by: Schuyler Eldridge <schuyler.eldridge@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.
Extends BorginUtils.bore (and related) to work where the source is a probe. Currently, if a user tries to do this, they will get an error about being unable to probe a probe because the old code would unconditionally wrap whatever the source was in
Probe/RWProbe. Change this to not wrap if the source is already a probe.Release Notes
Allow boring from a source which is already a probe.