Add Vec tests. Do a better job of generating widths.

1 files changed, 39 insertions, 0 deletions

diff --git a/src/test/scala/chiselTests/Vec.scala b/src/test/scala/chiselTests/Vec.scala
new file mode 100644
index 00000000..47e4af2c
--- /dev/null
+++ b/src/test/scala/chiselTests/Vec.scala
@@ -0,0 +1,39 @@
+package chiselTests
+
+import Chisel._
+import org.scalatest._
+import org.scalatest.prop._
+import Chisel.testers.BasicTester
+
+class VecSpec extends ChiselPropSpec {
+
+  class ValueTester(w: Int, values: List[Int]) extends BasicTester {
+    io.done := Bool(true)
+    val v = Vec(values.map(UInt(_, width = w)))
+    io.error := v.zip(values).map { case(a,b) => 
+      a != UInt(b)
+    }.foldLeft(UInt(0))(_##_)
+  }
+
+  property("Vecs should be assignable") {
+    forAll(safeUIntN(8)) { case(w: Int, v: List[Int]) =>
+      assert(execute{ new ValueTester(w, v) })
+    }
+  }
+
+  class TabulateTester(w: Int, n: Int) extends BasicTester {
+    io.done := Bool(true)
+    val v = Vec(Range(0, n).map(i => UInt(i * 2)))
+    val x = Vec(Array.tabulate(n){ i => UInt(i * 2) })
+    val u = Vec.tabulate(n)(i => UInt(i*2))
+    when(v.toBits != x.toBits) { io.error := UInt(1) }
+    when(v.toBits != u.toBits) { io.error := UInt(2) }
+    when(x.toBits != u.toBits) { io.error := UInt(3) }
+  }
+
+  property("Vecs should tabulate correctly") {
+    forAll(smallPosInts) { (n: Int) =>
+      assert(execute{ new TabulateTester(n) })
+    }
+  }
+}