Fix Nested Instantiate #4018
Merged
Fix Nested Instantiate #4018
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
sequencer
force-pushed
the
instantiate-class
branch
2 times, most recently
from
1a5f6f9
to
30ee35d
Compare
sequencer
commented
Apr 19, 2024
There was a problem hiding this comment.
This bug is because in each definition elaboration, previous elaborated definition and cache doesn't exist, so Definition/Instantiate inside other Definition never worked before.
This doesn't affect Module since it can be resolved by firtool dedup, but for Class, multiple Instantiate lead to different type: e.g. FooOM, FooOM_1, FooOM_2.
| @@ -475,4 +491,12 @@ class InstantiateSpec extends ChiselFunSpec with Utils { | |||
| ) | |||
| ) | |||
| } | |||
|
|
|||
| it("Nested Instantiate should work") { | |||
There was a problem hiding this comment.
Reproduce via:
mill chiselut[2.13.12].testOnly chiselTests.experimental.hierarchy.InstantiateSpec
Here is log:
List("Bar", "Bar_1", "Bar_2", "Bar_3", "Baz", "Baz_1", "Baz_2", "Baz_3", "Foo", "Foo_1", "Top") did not equal List("Bar", "Bar_1", "Baz", "Foo", "Foo_1", "Top")
ScalaTestFailureLocation: chiselTests.experimental.hierarchy.InstantiateSpec at (InstantiateSpec.scala:500)
Expected :List("Bar", "Bar_1", "Baz", "Foo", "Foo_1", "Top")
Actual :List("Bar", "Bar_1", "Bar_2", "Bar_3", "Baz", "Baz_1", "Baz_2", "Baz_3", "Foo", "Foo_1", "Top")
|
Thanks for the PR. I had been playing around with Instantiate and noticed this behavior, but I never got around to sending a PR or filing an issue. I took a quick look and I think this makes sense, I had something similar when I was trying to fix this on my end once. |
jackkoenig
removed
the
Backport
jackkoenig
reviewed
Apr 20, 2024
sequencer
force-pushed
the
instantiate-class
branch
from
fc9f326
to
5faf39a
Compare
14 tasks
sequencer
force-pushed
the
instantiate-class
branch
from
5faf39a
to
6f73e23
Compare
SpriteOvO
approved these changes
Apr 24, 2024
sequencer
added
the
Please Merge
mergify bot
pushed a commit
that referenced
this pull request
Apr 24, 2024
* minimal reproduce Nested Instantiate bug * expose cache and elaborated defination to inner defination * fix up (cherry picked from commit 02b01e8) # Conflicts: # core/src/main/scala/chisel3/experimental/hierarchy/core/Definition.scala # core/src/main/scala/chisel3/experimental/hierarchy/core/Instance.scala # core/src/main/scala/chisel3/internal/Builder.scala # src/main/scala/chisel3/aop/injecting/InjectingAspect.scala # src/main/scala/chisel3/stage/phases/Elaborate.scala # src/test/scala/chiselTests/experimental/hierarchy/InstantiateSpec.scala
mergify bot
pushed a commit
that referenced
this pull request
Apr 24, 2024
* minimal reproduce Nested Instantiate bug * expose cache and elaborated defination to inner defination * fix up (cherry picked from commit 02b01e8) # Conflicts: # core/src/main/scala/chisel3/experimental/hierarchy/core/Definition.scala # core/src/main/scala/chisel3/experimental/hierarchy/core/Instance.scala # core/src/main/scala/chisel3/internal/Builder.scala # src/main/scala/chisel3/aop/injecting/InjectingAspect.scala # src/main/scala/chisel3/stage/phases/Elaborate.scala
This was referenced Apr 24, 2024
mergify bot
pushed a commit
that referenced
this pull request
Apr 24, 2024
* minimal reproduce Nested Instantiate bug * expose cache and elaborated defination to inner defination * fix up (cherry picked from commit 02b01e8)
14 tasks
chiselbot
pushed a commit
that referenced
this pull request
Apr 24, 2024
chiselbot
pushed a commit
that referenced
this pull request
May 2, 2024
* Fix Nested Instantiate (#4018) * minimal reproduce Nested Instantiate bug * expose cache and elaborated defination to inner defination * fix up (cherry picked from commit 02b01e8) # Conflicts: # core/src/main/scala/chisel3/experimental/hierarchy/core/Definition.scala # core/src/main/scala/chisel3/experimental/hierarchy/core/Instance.scala # core/src/main/scala/chisel3/internal/Builder.scala # src/main/scala/chisel3/aop/injecting/InjectingAspect.scala # src/main/scala/chisel3/stage/phases/Elaborate.scala * Resolve backport conflicts --------- Co-authored-by: Jiuyang Liu <liu@jiuyang.me> Co-authored-by: Jack Koenig <koenig@sifive.com>
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.
When Instantiate a instantiable module, if it has other instantiable modules inside it, inner module will miss cache.
Contributor Checklist
docs/src?Type of Improvement
Desired Merge Strategy
Release Notes
Fix Nested Instantiate
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.