From bb12fe7f61d12f51cf5d56b2a66aca0a1234abb3 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Sat, 15 Apr 2017 00:00:48 -0700 Subject: Fix assignment from 0-entry Vec: add test (#580) * Partially revert 8e4ddc62db448b613ae327792e72defca4d115d4 It was an incomplete fix for handling Vec(0). * Fix assignment from 0-entry Vec: add test 375e2b6a0a456c55298d82837d28986de6211ebc introduced a regression for bundles containing zero-entry Vecs. Until zero-width UInts are supported, the zero-entry Vecs need to be flattened out before doing asUInt/asTypeOf on a bundle. Undoing that commit's replacement of Data.flatten with Aggregate.getElements is the best interim fix. --- src/test/scala/chiselTests/Vec.scala | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/test/scala/chiselTests/Vec.scala b/src/test/scala/chiselTests/Vec.scala index 2ece7c88..df2d6ec0 100644 --- a/src/test/scala/chiselTests/Vec.scala +++ b/src/test/scala/chiselTests/Vec.scala @@ -144,6 +144,11 @@ class ZeroEntryVecTester extends BasicTester { require(0.U.asTypeOf(bundleWithZeroEntryVec).getWidth == 1) require(bundleWithZeroEntryVec.asUInt.getWidth == 1) + val m = Module(new Module { + val io = IO(Output(bundleWithZeroEntryVec.cloneType)) + }) + Wire(init = m.io.bar) + stop() } -- cgit v1.2.3