Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support separately elaborating definition and instance in ChiselStage (backport #2512) #2520

Merged
merged 2 commits into from
May 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 12, 2022

This is an automatic backport of pull request #2512 done by Mergify.
Cherry-pick of a0aa4d1 has failed:

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

You are currently cherry-picking commit a0aa4d15.
  (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:
	new file:   src/test/scala/chiselTests/experimental/hierarchy/SeparateElaborationSpec.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/main/scala/chisel3/experimental/hierarchy/Definition.scala
	both modified:   core/src/main/scala/chisel3/experimental/hierarchy/Instance.scala
	both modified:   core/src/main/scala/chisel3/internal/Builder.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 refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will 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

…#2512)

(cherry picked from commit a0aa4d1)

# Conflicts:
#	core/src/main/scala/chisel3/experimental/hierarchy/Definition.scala
#	core/src/main/scala/chisel3/experimental/hierarchy/Instance.scala
#	core/src/main/scala/chisel3/internal/Builder.scala
@mergify mergify bot merged commit 1ee9adb into 3.5.x May 12, 2022
@mergify mergify bot deleted the mergify/bp/3.5.x/pr-2512 branch May 12, 2022 17:32
jackkoenig added a commit that referenced this pull request Feb 28, 2023
Fixes #2516

Previously,

reg r : UInt<8>, clock with :
  reset => (p, UInt<8>(3))
r is invalid

would compile to:

reg r : UInt<8>, clock
r <= UInt<8>(0)

now it compiles to:

reg r : UInt<8>, clock
wire r_1 : UInt<8>
r_1 is invalid
r <= mux(reset, UInt<8>(3), r_1)

This is consistent with the behavior for a reset with an asynchronous
reset.
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants