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 Vecs of empty Bundles #2543

Merged
merged 1 commit into from
May 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions core/src/main/scala/chisel3/Aggregate.scala
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ sealed class Vec[T <: Data] private[chisel3] (gen: => T, val length: Int) extend
}

// Since all children are the same, we can just use the sample_element rather than all children
// .get is safe because None means mixed directions, we only pass 1 so that's not possible
direction = ActualDirection.fromChildren(Set(sample_element.direction), resolvedDirection).get
direction =
ActualDirection.fromChildren(Set(sample_element.direction), resolvedDirection).getOrElse(ActualDirection.Empty)
}

// Note: the constructor takes a gen() function instead of a Seq to enforce
Expand Down Expand Up @@ -321,6 +321,7 @@ sealed class Vec[T <: Data] private[chisel3] (gen: => T, val length: Int) extend
case ActualDirection.Bidirectional(ActualDirection.Default) | ActualDirection.Unspecified =>
SpecifiedDirection.Unspecified
case ActualDirection.Bidirectional(ActualDirection.Flipped) => SpecifiedDirection.Flip
case ActualDirection.Empty => SpecifiedDirection.Unspecified
}
// TODO port technically isn't directly child of this data structure, but the result of some
// muxes / demuxes. However, this does make access consistent with the top-level bindings.
Expand Down
22 changes: 22 additions & 0 deletions src/test/scala/chiselTests/Vec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -517,4 +517,26 @@ class VecSpec extends ChiselPropSpec with Utils {
property("reduceTree should preserve input/output type") {
assertTesterPasses { new ReduceTreeTester() }
}

property("Vecs of empty Bundles and empty Records should work") {
class MyModule(gen: Record) extends Module {
val idx = IO(Input(UInt(2.W)))
val in = IO(Input(gen))
val out = IO(Output(gen))

val reg = RegInit(0.U.asTypeOf(Vec(4, gen)))
reg(idx) := in
out := reg(idx)
}
class EmptyBundle extends Bundle
class EmptyRecord extends Record {
val elements = collection.immutable.ListMap.empty
override def cloneType = (new EmptyRecord).asInstanceOf[this.type]
}
for (gen <- List(new EmptyBundle, new EmptyRecord)) {
val chirrtl = ChiselStage.emitChirrtl(new MyModule(gen))
chirrtl should include("input in : { }")
chirrtl should include("reg reg : { }[4]")
}
}
}