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

Remove overlapping inputForm=LowForm tests (bp #1753) #1770

Merged
merged 2 commits into from
Jul 17, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 16, 2020

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

Cherry-pick of f5dd8dd has failed:

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

You are currently cherry-picking commit f5dd8ddc.
  (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/test/scala/firrtlTests/LoweringCompilersSpec.scala

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

Cherry-pick of debee42 has failed:

On branch mergify/bp/1.3.x/pr-1753
Your branch is ahead of 'origin/1.3.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit debee429.
  (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/test/scala/firrtlTests/CustomTransformSpec.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/

@mergify mergify bot requested a review from a team as a code owner July 16, 2020 18:15
@mergify mergify bot added bp-conflict Backport Automated backport, please consider for minor release labels Jul 16, 2020
Remove tests from LoweringCompilerSpec testing the placement of
inputForm=LowForm legacy, custom transforms. This behavior is already
tested in the CustomTransformSpec.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit f5dd8dd)

# Conflicts:
#	src/test/scala/firrtlTests/LoweringCompilersSpec.scala
Refactor the test used in the CustomTransformSpec to assert that
inputForm=LowForm legacy transforms run right before the emitter (see
note below!). The new test looks only for a list of (customTransform,
emitter) in a sliding, size-2 window of the flattened transform order.
Previously, this was looking for a match before and after the custom
transform. The old implementation necessitate busywork updates of the
test when new transforms are added that changed the transform running
before the custom transform.

Note: this test, as written is intentionally wrong. When the
LegalizeAndReductionsTransform was added, this was placed after
inputForm=LowForm and before the Verilog emitters. However, the test
is supposed to ensure that an inputForm=LowForm transform runs
immediately before its emitter. I'm intentionally leaving the test
broken. This behavior can be changed in a follow-on commit if need be.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit debee42)
@seldridge seldridge force-pushed the mergify/bp/1.3.x/pr-1753 branch from 1c1be2e to 3fd2a03 Compare July 17, 2020 00:56
@seldridge
Copy link
Member

This was manually cleaned up in a rebase to remove usages of verification statements. On 1.3.x, currently inputForm=LowForm or using optionalPrerequisites=Forms.LowFormOptimized will result in a transform running right before LegalizeAndReductionsTransform. This isn't necessarily correct (or wrong), but this PR is only trying to clean up tests to make future modifications more straightforward.

@seldridge seldridge merged commit d56cecd into 1.3.x Jul 17, 2020
@mergify mergify bot deleted the mergify/bp/1.3.x/pr-1753 branch July 17, 2020 03:21
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.

1 participant