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

Make PriorityMux stack safe (backport #2854) #2855

Merged
merged 3 commits into from
Dec 7, 2022
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 19, 2022

This is an automatic backport of pull request #2854 done by Mergify.
Cherry-pick of 269ce47 has failed:

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

You are currently cherry-picking commit 269ce472.
  (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/SeqUtils.scala
	new file:   src/test/scala/chiselTests/util/PriorityMuxSpec.scala

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/test/scala/chiselTests/util/PipeSpec.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

It used to be implemented with recursion, now it's implemented with a
stack safe reverse and foldLeft.

Also there were no tests for PriorityMux so I added one which helps
prove the change is functionally correct.

(cherry picked from commit 269ce47)

# Conflicts:
#	src/test/scala/chiselTests/util/PipeSpec.scala
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Nov 19, 2022
@mergify mergify bot merged commit 41d0d4c into 3.5.x Dec 7, 2022
@mergify mergify bot deleted the mergify/bp/3.5.x/pr-2854 branch December 7, 2022 00:41
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