From 3b5fda0c604b393833769250ade9f7d13ca4e5e7 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Wed, 9 Sep 2020 14:43:17 -0700 Subject: Recursively generate one-hot multiplexers for aggregates (#1557) Test all cases in ParameterizedOneHotTesters Co-authored-by: Jack Koenig --- src/test/scala/chiselTests/OneHotMuxSpec.scala | 29 ++++++++++++-------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/test/scala/chiselTests/OneHotMuxSpec.scala b/src/test/scala/chiselTests/OneHotMuxSpec.scala index cc359e8e..fb6edb2c 100644 --- a/src/test/scala/chiselTests/OneHotMuxSpec.scala +++ b/src/test/scala/chiselTests/OneHotMuxSpec.scala @@ -26,8 +26,7 @@ class OneHotMuxSpec extends AnyFreeSpec with Matchers with ChiselRunners { assertTesterPasses(new AllSameFixedPointOneHotTester) } "simple one hot mux with all same parameterized sint values should work" in { - val values: Seq[SInt] = Seq((-3).S, (-5).S, (-7).S, (-11).S) - assertTesterPasses(new ParameterizedOneHotTester(values, SInt(8.W), -5.S(8.W))) + assertTesterPasses(new ParameterizedOneHotTester) } "simple one hot mux with all same parameterized aggregates containing fixed values should work" in { assertTesterPasses(new ParameterizedAggregateOneHotTester) @@ -121,14 +120,14 @@ class AllSameFixedPointOneHotTester extends BasicTester { stop() } -class ParameterizedOneHotTester[T <: Data](values: Seq[T], outGen: T, expected: T) extends BasicTester { - val dut = Module(new ParameterizedOneHot(values, outGen)) - dut.io.selectors(0) := false.B - dut.io.selectors(1) := true.B - dut.io.selectors(2) := false.B - dut.io.selectors(3) := false.B +class ParameterizedOneHotTester extends BasicTester { + val values: Seq[Int] = Seq(-3, -5, -7, -11) + for ((v, i) <- values.zipWithIndex) { + val dut = Module(new ParameterizedOneHot(values.map(_.S), SInt(8.W))) + dut.io.selectors := (1 << i).U(4.W).asBools - assert(dut.io.out.asUInt() === expected.asUInt()) + assert(dut.io.out.asUInt() === v.S(8.W).asUInt()) + } stop() } @@ -178,14 +177,12 @@ object Agg2 extends HasMakeLit[Agg2] { class ParameterizedAggregateOneHotTester extends BasicTester { val values = (0 until 4).map { n => Agg1.makeLit(n) } + for ((v, i) <- values.zipWithIndex) { + val dut = Module(new ParameterizedAggregateOneHot(Agg1, new Agg1)) + dut.io.selectors := (1 << i).U(4.W).asBools - val dut = Module(new ParameterizedAggregateOneHot(Agg1, new Agg1)) - dut.io.selectors(0) := false.B - dut.io.selectors(1) := true.B - dut.io.selectors(2) := false.B - dut.io.selectors(3) := false.B - - assert(dut.io.out.asUInt() === values(1).asUInt()) + assert(dut.io.out.asUInt() === values(i).asUInt()) + } stop() } -- cgit v1.2.3