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

Remove Deprecated Usages of chisel3.Driver, CircuitForm (bp #1481) #1492

Merged
merged 8 commits into from
Jun 23, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2020

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

Cherry-pick of 5af61d8 has failed:

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

You are currently cherry-picking commit 5af61d80.
  (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/chisel3/compatibility.scala

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

Cherry-pick of b5e5989 has failed:

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

You are currently cherry-picking commit b5e59895.
  (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/chiselTests/ChiselSpec.scala

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

Cherry-pick of 6e03f63 has failed:

On branch mergify/bp/3.3.x/pr-1481
Your branch is ahead of 'origin/3.3.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 6e03f63d.
  (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/main/scala/chisel3/testers/TesterDriver.scala
	modified:   src/test/scala/chiselTests/AnalogSpec.scala
	modified:   src/test/scala/chiselTests/AnnotatingDiamondSpec.scala
	modified:   src/test/scala/chiselTests/AnnotationNoDedup.scala
	modified:   src/test/scala/chiselTests/Assert.scala
	modified:   src/test/scala/chiselTests/AsyncResetSpec.scala
	modified:   src/test/scala/chiselTests/AutoClonetypeSpec.scala
	modified:   src/test/scala/chiselTests/AutoNestedCloneSpec.scala
	modified:   src/test/scala/chiselTests/BetterNamingTests.scala
	modified:   src/test/scala/chiselTests/BlackBox.scala
	modified:   src/test/scala/chiselTests/BlackBoxImpl.scala
	modified:   src/test/scala/chiselTests/BoringUtilsSpec.scala
	modified:   src/test/scala/chiselTests/BundleLiteralSpec.scala
	modified:   src/test/scala/chiselTests/BundleSpec.scala
	modified:   src/test/scala/chiselTests/Clock.scala
	modified:   src/test/scala/chiselTests/CloneModuleSpec.scala
	modified:   src/test/scala/chiselTests/CompatibilitySpec.scala
	modified:   src/test/scala/chiselTests/CompileOptionsTest.scala
	modified:   src/test/scala/chiselTests/ConnectSpec.scala
	modified:   src/test/scala/chiselTests/DataPrint.scala
	modified:   src/test/scala/chiselTests/DecoupledSpec.scala
	modified:   src/test/scala/chiselTests/Direction.scala
	modified:   src/test/scala/chiselTests/DontTouchSpec.scala
	modified:   src/test/scala/chiselTests/EnableShiftRegister.scala
	modified:   src/test/scala/chiselTests/ExtModule.scala
	modified:   src/test/scala/chiselTests/FixedPointSpec.scala
	modified:   src/test/scala/chiselTests/GCD.scala
	modified:   src/test/scala/chiselTests/IOCompatibility.scala
	modified:   src/test/scala/chiselTests/InlineSpec.scala
	modified:   src/test/scala/chiselTests/InstanceNameSpec.scala
	modified:   src/test/scala/chiselTests/IntervalSpec.scala
	modified:   src/test/scala/chiselTests/InvalidateAPISpec.scala
	modified:   src/test/scala/chiselTests/LiteralExtractorSpec.scala
	modified:   src/test/scala/chiselTests/LoadMemoryFromFileSpec.scala
	modified:   src/test/scala/chiselTests/MemorySearch.scala
	modified:   src/test/scala/chiselTests/MissingCloneBindingExceptionSpec.scala
	modified:   src/test/scala/chiselTests/MixedVecSpec.scala
	modified:   src/test/scala/chiselTests/Module.scala
	modified:   src/test/scala/chiselTests/ModuleExplicitResetSpec.scala
	modified:   src/test/scala/chiselTests/MultiAssign.scala
	modified:   src/test/scala/chiselTests/MultiClockSpec.scala
	modified:   src/test/scala/chiselTests/MuxSpec.scala
	modified:   src/test/scala/chiselTests/NamingAnnotationTest.scala
	modified:   src/test/scala/chiselTests/OptionBundle.scala
	modified:   src/test/scala/chiselTests/Padding.scala
	modified:   src/test/scala/chiselTests/PrintableSpec.scala
	modified:   src/test/scala/chiselTests/RawModuleSpec.scala
	modified:   src/test/scala/chiselTests/RebindingSpec.scala
	modified:   src/test/scala/chiselTests/RecordSpec.scala
	modified:   src/test/scala/chiselTests/Reg.scala
	modified:   src/test/scala/chiselTests/ResetSpec.scala
	modified:   src/test/scala/chiselTests/Risc.scala
	modified:   src/test/scala/chiselTests/SIntOps.scala
	modified:   src/test/scala/chiselTests/Stack.scala
	modified:   src/test/scala/chiselTests/StrongEnum.scala
	modified:   src/test/scala/chiselTests/SwitchSpec.scala
	modified:   src/test/scala/chiselTests/TransitNameSpec.scala
	modified:   src/test/scala/chiselTests/UIntOps.scala
	modified:   src/test/scala/chiselTests/Vec.scala
	modified:   src/test/scala/chiselTests/When.scala
	modified:   src/test/scala/chiselTests/experimental/GroupSpec.scala
	modified:   src/test/scala/chiselTests/experimental/ProgrammaticPortsSpec.scala
	modified:   src/test/scala/chiselTests/stage/ChiselMainSpec.scala
	modified:   src/test/scala/chiselTests/stage/phases/ConvertSpec.scala
	modified:   src/test/scala/chiselTests/util/random/PRNGSpec.scala

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

	both modified:   src/test/scala/chiselTests/util/random/LFSRSpec.scala

Cherry-pick of 36fae73 has failed:

On branch mergify/bp/3.3.x/pr-1481
Your branch is ahead of 'origin/3.3.x' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 36fae73b.
  (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/chisel3/compatibility.scala

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

Cherry-pick of cc4fa58 has failed:

On branch mergify/bp/3.3.x/pr-1481
Your branch is ahead of 'origin/3.3.x' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit cc4fa583.
  (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/chiselTests/ChiselSpec.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 June 23, 2020 00:35
@mergify mergify bot added bp-conflict Backport Automated backport, please consider for minor release labels Jun 23, 2020
Adds a new method, chiselTests.Util.containsCause, that will search
for a polymorphic exception anywhere in a stack trace. This is useful
if exceptions may move around (e.g., if they are suddenly wrapped in a
StageError).

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
@seldridge seldridge force-pushed the mergify/bp/3.3.x/pr-1481 branch from b6b9f25 to 1ec1ef4 Compare June 23, 2020 17:47
This migrates the tests to Chisel 3.4/FIRRTL 1.4. This primarily
involves removing usages of deprecated methods including:

- Remove usages of Driver
- Use ChiselStage methods instead of BackendCompilationUtilities
  methods
- Use Dependency API for custom transforms
- Use extractCause to unpack StackError

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
seldridge and others added 4 commits June 23, 2020 15:42
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
Co-authored-by: Chick Markley <chick@qrhino.com>
Co-authored-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
@seldridge seldridge force-pushed the mergify/bp/3.3.x/pr-1481 branch from 22dfa13 to 799d3d8 Compare June 23, 2020 19:42
@seldridge seldridge merged commit 4e783e2 into 3.3.x Jun 23, 2020
@mergify mergify bot deleted the mergify/bp/3.3.x/pr-1481 branch June 23, 2020 20:26
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 bp-conflict
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant