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

Fix chisel3 <> for Bundles that contain compatibility Bundles (Take 2) (backport #2031) #2034

Merged
merged 2 commits into from
Jul 9, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2021

This is an automatic backport of pull request #2031 done by Mergify.
Cherry-pick of 5183ef8 has failed:

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

You are currently cherry-picking commit 5183ef88.
  (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/internal/BiConnect.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/test/scala/chiselTests/CompatibilityInteroperabilitySpec.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.io/

#2031)

PR #2023 fixed a composition issue for chisel3 biconnects delegating to
FIRRTL partial connect when compatibility mode Bundles are elements of
chisel3 Bundles. It missed an important case though that caused
previously working code to break.

The bug is fixed by doing the automatic flipping for compatibility mode
Bundles that have "Input" as a direction in addition to those that are
"Flipped".

(cherry picked from commit 5183ef8)

# Conflicts:
#	src/test/scala/chiselTests/CompatibilityInteroperabilitySpec.scala
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Jul 9, 2021
@mergify mergify bot merged commit 0b60a65 into 3.4.x Jul 9, 2021
@mergify mergify bot deleted the mergify/bp/3.4.x/pr-2031 branch July 9, 2021 22:11
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.

1 participant