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

Fix SMT Memory Bug (bp #1942) #1945

Closed
wants to merge 1 commit into from
Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 10, 2020

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

Cherry-pick of 4c6993b has failed:

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

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

Changes to be committed:

	modified:   src/test/scala/firrtl/backends/experimental/smt/end2end/MemorySpec.scala

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

	both modified:   src/main/scala/firrtl/backends/experimental/smt/FirrtlToTransitionSystem.scala

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 config editor.

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

* smt: add test for write port collision

* smt: add missing call to insertDummyAssignsForMemoryOutputs

* smt: fix typo in write port code

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 4c6993b)

# Conflicts:
#	src/main/scala/firrtl/backends/experimental/smt/FirrtlToTransitionSystem.scala
@mergify mergify bot requested a review from a team as a code owner November 10, 2020 18:58
@mergify mergify bot requested review from albertchen-sifive and removed request for a team November 10, 2020 18:58
@mergify mergify bot added the conflicts label Nov 10, 2020
@mergify mergify bot mentioned this pull request Nov 10, 2020
12 tasks
@mergify mergify bot added the Backport Automated backport, please consider for minor release label Nov 10, 2020
@ekiwi
Copy link
Contributor

ekiwi commented Nov 10, 2020

Will re-attempt once the other smt PR backport is in.

@ekiwi ekiwi closed this Nov 10, 2020
@mergify mergify bot deleted the mergify/bp/1.4.x/pr-1942 branch November 10, 2020 19:01
@ekiwi ekiwi restored the mergify/bp/1.4.x/pr-1942 branch November 11, 2020 00:56
@ekiwi ekiwi reopened this Nov 11, 2020
@ekiwi ekiwi closed this Nov 11, 2020
@mergify mergify bot deleted the mergify/bp/1.4.x/pr-1942 branch November 11, 2020 00:57
@ekiwi ekiwi restored the mergify/bp/1.4.x/pr-1942 branch November 11, 2020 04:31
@ekiwi
Copy link
Contributor

ekiwi commented Nov 11, 2020

@mergify rebase

@mergify
Copy link
Contributor Author

mergify bot commented Nov 11, 2020

Command rebase: success

Branch has been successfully rebased

Hey, I reacted but my real name is @Mergifyio

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 conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant