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

Support literals in DataView (backport #3964) #3965

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 4, 2024

This also fixes a bug with the rename map for non 1-1 views of literals.

Contributor Checklist

  • Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • Did you add appropriate documentation in docs/src?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

Arguably a Feature or Bugfix, but I lean bugfix.

  • Bugfix

Desired Merge Strategy

  • Squash

Release Notes

View of literals will now themselves be literals. This also fixes an internal bug related to views of literals.

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels? (Select the most appropriate one based on the "Type of Improvement")
  • Did you mark the proper milestone (Bug fix: 3.6.x, 5.x, or 6.x depending on impact, API modification or big change: 7.0)?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you do one of the following when ready to merge:
    • Squash: You/ the contributor Enable auto-merge (squash), clean up the commit message, and label with Please Merge.
    • Merge: Ensure that contributor has cleaned up their commit history, then merge with Create a merge commit.

This is an automatic backport of pull request #3964 done by [Mergify](https://mergify.com).

Original PR Body

This also fixes a bug with the rename map for non 1-1 views of literals.

Contributor Checklist

  • Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • Did you add appropriate documentation in docs/src?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

Arguably a Feature or Bugfix, but I lean bugfix.

  • Bugfix

Desired Merge Strategy

  • Squash

Release Notes

View of literals will now themselves be literals. This also fixes an internal bug related to views of literals.

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels? (Select the most appropriate one based on the "Type of Improvement")
  • Did you mark the proper milestone (Bug fix: 3.6.x, 5.x, or 6.x depending on impact, API modification or big change: 7.0)?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you do one of the following when ready to merge:
    • Squash: You/ the contributor Enable auto-merge (squash), clean up the commit message, and label with Please Merge.
    • Merge: Ensure that contributor has cleaned up their commit history, then merge with Create a merge commit.

(cherry picked from commit ce05462)

# Conflicts:
#	src/test/scala/chiselTests/experimental/DataView.scala
Copy link
Contributor Author

mergify bot commented Apr 4, 2024

Cherry-pick of ce05462 has failed:

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

You are currently cherry-picking commit ce05462c2.
  (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/Aggregate.scala
	modified:   core/src/main/scala/chisel3/Element.scala
	modified:   core/src/main/scala/chisel3/internal/Builder.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/test/scala/chiselTests/experimental/DataView.scala

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

@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Apr 4, 2024
@github-actions github-actions bot added the Bugfix Fixes a bug, will be included in release notes label Apr 4, 2024
@chiselbot chiselbot merged commit 2e1e702 into 5.x Apr 4, 2024
17 checks passed
@chiselbot chiselbot deleted the mergify/bp/5.x/pr-3964 branch April 4, 2024 17:58
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 Bugfix Fixes a bug, will be included in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants