Add support for Vec literals of empty Vecs #4070
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also tweak Vec.Lit code to use cloneAsSuperType rather than implementing its own version of the same concept.
jackkoenig
commented
May 17, 2024
| @@ -489,7 +489,6 @@ sealed class Vec[T <: Data] private[chisel3] (gen: => T, val length: Int) extend | |||
| s"are less than zero or greater or equal to than Vec length" | |||
| ) | |||
| } | |||
| cloneSupertype(elementInitializers.map(_._2), s"Vec.Lit(...)") | |||
There was a problem hiding this comment.
This was being used as a check, but it is what was blocking size-0 from working in the Vec(0, ...).Lit use case. Rather, that check is only needed when using the Vec.Lit(...) API (since no element type is given) so I basically moved this check there but also went ahead and used it to figure out the resulting Vec type.
jackkoenig
commented
May 17, 2024
Comment on lines
+364
to
370
| "Empty bundle literals" should "be supported" in { | ||
| val chirrtl = ChiselStage.emitCHIRRTL(new RawModule { | ||
| val lit = (new Bundle {}).Lit() | ||
| lit.litOption should equal(Some(0)) | ||
| }) | ||
| } | ||
| } |
There was a problem hiding this comment.
I also added this test, but it already worked correctly.
14 tasks
mwachs5
approved these changes
May 18, 2024
mergify bot
pushed a commit
that referenced
this pull request
May 20, 2024
Also tweak Vec.Lit code to use cloneAsSuperType rather than implementing its own version of the same concept. (cherry picked from commit 86082b1) # Conflicts: # src/test/scala/chiselTests/BundleLiteralSpec.scala # src/test/scala/chiselTests/VecLiteralSpec.scala
mergify bot
pushed a commit
that referenced
this pull request
May 20, 2024
Also tweak Vec.Lit code to use cloneAsSuperType rather than implementing its own version of the same concept. (cherry picked from commit 86082b1)
This was referenced May 20, 2024
chiselbot
pushed a commit
that referenced
this pull request
May 20, 2024
chiselbot
pushed a commit
that referenced
this pull request
May 20, 2024
* Add support for Vec literals of empty Vecs (#4070) Also tweak Vec.Lit code to use cloneAsSuperType rather than implementing its own version of the same concept. (cherry picked from commit 86082b1) # Conflicts: # src/test/scala/chiselTests/BundleLiteralSpec.scala # src/test/scala/chiselTests/VecLiteralSpec.scala * Resolve backport conflicts --------- Co-authored-by: Jack Koenig <koenig@sifive.com>
This was referenced May 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also tweak Vec.Lit code to use cloneAsSuperType rather than implementing its own version of the same concept.
Contributor Checklist
docs/src?Type of Improvement
Desired Merge Strategy
Release Notes
Reviewer Checklist (only modified by reviewer)
3.6.x,5.x, or6.xdepending on impact, API modification or big change:7.0)?Enable auto-merge (squash), clean up the commit message, and label withPlease Merge.Create a merge commit.