Skip to content

Commit

Permalink
Fix Select.attachedTo (#4458)
Browse files Browse the repository at this point in the history
Previously it would always fail to find anything.

(cherry picked from commit 1aa41cd)

# Conflicts:
#	src/main/scala/chisel3/aop/Select.scala
  • Loading branch information
jackkoenig authored and mergify[bot] committed Oct 10, 2024
1 parent f852d07 commit c59842a
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
11 changes: 11 additions & 0 deletions src/main/scala/chisel3/aop/Select.scala
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ object Select {
*/
def attachedTo(module: BaseModule)(signal: Data): Set[Data] = {
check(module)
<<<<<<< HEAD
module._component.get
.asInstanceOf[DefModule]
.commands
Expand All @@ -381,6 +382,16 @@ object Select {
}
.flatMap { seq => seq.map(_.id.asInstanceOf[Data]) }
.toSet
=======
collect(
module._component.get
.asInstanceOf[DefModule]
.block
.getCommands()
) {
case Attach(_, seq) if seq.contains(Node(signal)) => seq
}.flatMap { seq => seq.map(_.id.asInstanceOf[Data]) }.toSet
>>>>>>> 1aa41cdb7 (Fix Select.attachedTo (#4458))
}

/** Selects all connections to a signal or its parent signal(s) (if the signal is an element of an aggregate signal)
Expand Down
14 changes: 14 additions & 0 deletions src/test/scala/chiselTests/aop/SelectSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,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 {
execute(
() => new SelectTester(Seq(0, 1, 2)),
Expand Down

0 comments on commit c59842a

Please sign in to comment.