Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 8, 2024

Previous behavior would always put the new probe expression in the instance's module body, but this is incompatible with instances built with Instantiate.

Given FIRRTL now supports this, we can improve this API.

Additionally, added a few more D/I + BoringUtils tests

Contributor Checklist

  • [N/A] Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • Did you add appropriate documentation in docs/src?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

  • Bugfix

Desired Merge Strategy

  • Squash: The PR will be squashed and merged (choose this if you have no preference).

Release Notes

BoringUtils.rwTap can now works on a port of an instance: Instance[..]

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels? (Select the most appropriate one based on the "Type of Improvement")
  • Did you mark the proper milestone (Bug fix: 3.6.x, 5.x, or 6.x depending on impact, API modification or big change: 7.0)?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you do one of the following when ready to merge:
    • Squash: You/ the contributor Enable auto-merge (squash), clean up the commit message, and label with Please Merge.
    • Merge: Ensure that contributor has cleaned up their commit history, then merge with Create a merge commit.

This is an automatic backport of pull request #4451 done by [Mergify](https://mergify.com).

* Fix Boring.rwTap on instance ports

Previous behavior would always put the new probe expression in the
instance's module body, but this is incompatible with instances built
with Instantiate.

Given FIRRTL now supports this, we can improve this API.

Additionally, added a few more D/I + BoringUtils tests

* Added test of rwTap on RWProbe

* Testing tap of instance probe port

(cherry picked from commit 3bbf860)

# Conflicts:
#	src/main/scala/chisel3/util/experimental/BoringUtils.scala
#	src/test/scala/chiselTests/BoringUtilsTapSpec.scala
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Oct 8, 2024
Copy link
Contributor Author

mergify bot commented Oct 8, 2024

Cherry-pick of 3bbf860 has failed:

On branch mergify/bp/6.x/pr-4451
Your branch is up to date with 'origin/6.x'.

You are currently cherry-picking commit 3bbf860f7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/test/scala/chiselTests/BoringUtilsSpec.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/main/scala/chisel3/util/experimental/BoringUtils.scala
	both modified:   src/test/scala/chiselTests/BoringUtilsTapSpec.scala

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the Bugfix Fixes a bug, will be included in release notes label Oct 8, 2024
@chiselbot chiselbot merged commit 1902a5e into 6.x Nov 25, 2024
15 checks passed
@chiselbot chiselbot deleted the mergify/bp/6.x/pr-4451 branch November 25, 2024 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Automated backport, please consider for minor release Bugfix Fixes a bug, will be included in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants