chisel
chisel copied to clipboard
Add support for Instantiate for BlackBox, ExtModule, and IntrinsicModule (backport #3349)
This is an automatic backport of pull request #3349 done by Mergify. Cherry-pick of 951f8b7cc688f6b49ab9b3461a9911d28f300fc4 has failed:
On branch mergify/bp/3.6.x/pr-3349
Your branch is up to date with 'origin/3.6.x'.
You are currently cherry-picking commit 951f8b7cc.
(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: core/src/main/scala/chisel3/experimental/hierarchy/Instantiate.scala
modified: core/src/main/scala/chisel3/experimental/hierarchy/core/Instance.scala
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/test/scala/chiselTests/experimental/hierarchy/InstantiateSpec.scala
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branch
Additionally, on Mergify dashboard you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
Original PR Body
I split out a commit of @fabianschuiki's from https://github.com/chipsalliance/chisel/pull/3337 because this should be backported.
Contributor Checklist
- [ ] Did you add Scaladoc to every public function/method?
- [x] Did you add at least one test demonstrating the PR?
- [x] Did you delete any extraneous printlns/debugging code?
- [x] Did you specify the type of improvement?
- [ ] Did you add appropriate documentation in
docs/src? - [x] Did you request a desired merge strategy?
- [ ] Did you add text to be included in the Release Notes for this change?
Type of Improvement
- Feature (or new API)
Desired Merge Strategy
- Squash
Release Notes
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.5.xor3.6.xdepending on impact, API modification or big change:5.0.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 withPlease Merge. - [ ] Merge: Ensure that contributor has cleaned up their commit history, then merge with
Create a merge commit.
- [ ] Squash: You/ the contributor