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.

Sign up for GitHub

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

Fix Select.attachedTo #4458

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Fix Select.attachedTo #4458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/chisel3/aop/Select.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ object Select {
.block
.getCommands()
) {
case Attach(_, seq) if seq.contains(signal) => seq
case Attach(_, seq) if seq.contains(Node(signal)) => seq
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The type of seq is Seq[Node] while signal is Data and obviously Data can never equal Node.

}.flatMap { seq => seq.map(_.id.asInstanceOf[Data]) }.toSet
}

Expand Down
14 changes: 14 additions & 0 deletions src/test/scala/chiselTests/aop/SelectSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,20 @@ class SelectSpec extends ChiselFlatSpec {

}

"Test" should "pass if selecting attach" in {
import chisel3.experimental.{attach, Analog}
class AttachTest extends RawModule {
val a, b, c = IO(Analog(8.W))
attach(a, b, c)
}
val dut = ChiselGeneratorAnnotation(() => new AttachTest)
.elaborate(1)
.asInstanceOf[DesignAnnotation[AttachTest]]
.design
Select.attachedTo(dut)(dut.a) should be(Set(dut.a, dut.b, dut.c))

}

"Test" should "pass if selecting ops by kind" in {
val dut = ChiselGeneratorAnnotation(() => {
new SelectTester(Seq(0, 1, 2))
Expand Down