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

Deprecate all Injecting Aspect Code (backport #4415) #4416

Merged
merged 2 commits into from
Sep 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 27, 2024

Deprecate injecting aspect code as of Chisel 6.6.0. These were planned to be deprecated some time ago (see ROADMAP.md). However, these had a long user in @sequencer. He is now off of these and there is nothing blocking their removal.

I will follow this with a commit to remove these from main for Chisel 7.

For similar, verification-focused functionality can be selectively added to the circuit, use layers.

Release Notes

Deprecate injecting aspects as of Chisel 6.6.0 and plan for removal in Chisel 7.


This is an automatic backport of pull request #4415 done by Mergify.

Deprecate injecting aspect code as of Chisel 6.6.0.  These were planned to
be deprecated some time ago (see ROADMAP.md).  However, these had a long
user in @sequencer.  He is now off of these and there is nothing blocking
their removal.

I will follow this with a commit to remove these from `main` for Chisel 7.

For similar, verification-focused functionality can be selectively added
to the circuit, use layers.

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

# Conflicts:
#	build.sbt
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Sep 27, 2024
Copy link
Contributor Author

mergify bot commented Sep 27, 2024

Cherry-pick of d292a5e has failed:

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

You are currently cherry-picking commit d292a5eef.
  (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/ModuleAspect.scala
	modified:   src/main/scala/chisel3/aop/injecting/InjectStatement.scala
	modified:   src/main/scala/chisel3/aop/injecting/InjectingAspect.scala
	modified:   src/main/scala/chisel3/aop/injecting/InjectingPhase.scala
	modified:   src/main/scala/chisel3/stage/phases/MaybeInjectingPhase.scala

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@seldridge seldridge merged commit 39ec860 into 6.x Sep 27, 2024
13 checks passed
@seldridge seldridge deleted the mergify/bp/6.x/pr-4415 branch September 27, 2024 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
API Modification 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