Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Speed up InferTypes and CInferTypes (bp #1601) #1616

Merged
merged 4 commits into from
Jun 3, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 14, 2020

This is an automated backport of pull request #1601 done by Mergify

Cherry-pick of a15f65c has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   src/main/scala/firrtl/passes/InferTypes.scala

no changes added to commit (use "git add" and/or "git commit -a")

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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 simulator.

Finally, you can contact us on https://mergify.io/

Do the same in CInferTypes

(cherry picked from commit a15f65c)

# Conflicts:
#	src/main/scala/firrtl/passes/InferTypes.scala
@mergify mergify bot requested a review from a team as a code owner May 14, 2020 01:37
@mergify mergify bot added bp-conflict Backport Automated backport, please consider for minor release labels May 14, 2020
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
@seldridge seldridge force-pushed the mergify/bp/1.2.x/pr-1601 branch from 7d9c317 to 2ec019f Compare June 3, 2020 15:40
@seldridge seldridge merged commit b509aed into 1.2.x Jun 3, 2020
@seldridge seldridge deleted the mergify/bp/1.2.x/pr-1601 branch June 3, 2020 16:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Backport Automated backport, please consider for minor release bp-conflict
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants