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

Enable WARL custom CSRs, long-latency CSR accesses (backport #3388) #3405

Merged
merged 1 commit into from
Jul 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 4, 2023

This is an automatic backport of pull request #3388 done by Mergify.
Cherry-pick of 005c6db has failed:

On branch mergify/bp/master/pr-3388
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 005c6dbe1.
  (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:   src/main/scala/rocket/CSR.scala
	modified:   src/main/scala/rocket/PTW.scala
	modified:   src/main/scala/tile/CustomCSRs.scala
	modified:   src/main/scala/tile/LazyRoCC.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/main/scala/rocket/RocketCore.scala

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

* Support setting custom CSRs from datapath

* Support CSR stalls

(cherry picked from commit 005c6db)
@jerryz123 jerryz123 force-pushed the mergify/bp/master/pr-3388 branch from 0b4b8c3 to 0070f95 Compare July 5, 2023 16:55
@jerryz123 jerryz123 enabled auto-merge July 5, 2023 17:13
@jerryz123 jerryz123 merged commit 836be7a into master Jul 5, 2023
@jerryz123 jerryz123 deleted the mergify/bp/master/pr-3388 branch July 5, 2023 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant