diff options
| author | ducky | 2018-01-19 19:19:43 -0800 |
|---|---|---|
| committer | Richard Lin | 2018-01-19 21:39:36 -0800 |
| commit | 70ca35b9d7b3884e5f701d49bc5286f89701fd14 (patch) | |
| tree | 018a4d886b146e326c7dbabf51056a71dd6ccd7d /src/test/scala/chiselTests/Vec.scala | |
| parent | 6b277ff0c3266e9b02fe9b483086ab46085202ce (diff) | |
Fix deprecations in tests
Diffstat (limited to 'src/test/scala/chiselTests/Vec.scala')
| -rw-r--r-- | src/test/scala/chiselTests/Vec.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/scala/chiselTests/Vec.scala b/src/test/scala/chiselTests/Vec.scala index bf25ed82..395624f7 100644 --- a/src/test/scala/chiselTests/Vec.scala +++ b/src/test/scala/chiselTests/Vec.scala @@ -21,7 +21,7 @@ class RegTesterMod(vecSize: Int) extends Module { val in = Input(Vec(vecSize, UInt())) val out = Output(Vec(vecSize, UInt())) }) - val vecReg = RegNext(io.in, Vec(Seq.fill(vecSize){0.U})) + val vecReg = RegNext(io.in, VecInit(Seq.fill(vecSize){0.U})) io.out := vecReg } @@ -50,7 +50,7 @@ class LitTester(w: Int, values: List[Int]) extends BasicTester { } class RegTester(w: Int, values: List[Int]) extends BasicTester { - val v = Vec(values.map(_.U(w.W))) + val v = VecInit(values.map(_.U(w.W))) val dut = Module(new RegTesterMod(values.length)) val doneReg = RegInit(false.B) dut.io.in := v @@ -66,7 +66,7 @@ class RegTester(w: Int, values: List[Int]) extends BasicTester { } class IOTester(w: Int, values: List[Int]) extends BasicTester { - val v = Vec(values.map(_.U(w.W))) // Does this need a Wire? No. It's a Vec of Lits and hence synthesizeable. + val v = VecInit(values.map(_.U(w.W))) // Does this need a Wire? No. It's a Vec of Lits and hence synthesizeable. val dut = Module(new IOTesterMod(values.length)) dut.io.in := v for ((a,b) <- dut.io.out.zip(values)) { @@ -86,7 +86,7 @@ class IOTesterModFill(vecSize: Int) extends Module { } class ValueTester(w: Int, values: List[Int]) extends BasicTester { - val v = Vec(values.map(_.asUInt(w.W))) + val v = VecInit(values.map(_.asUInt(w.W))) for ((a,b) <- v.zip(values)) { assert(a === b.asUInt) } @@ -94,9 +94,9 @@ class ValueTester(w: Int, values: List[Int]) extends BasicTester { } class TabulateTester(n: Int) extends BasicTester { - val v = Vec(Range(0, n).map(i => (i*2).asUInt)) - val x = Vec(Array.tabulate(n){ i => (i*2).asUInt }) - val u = Vec.tabulate(n)(i => (i*2).asUInt) + val v = VecInit(Range(0, n).map(i => (i*2).asUInt)) + val x = VecInit(Array.tabulate(n){ i => (i*2).asUInt }) + val u = VecInit.tabulate(n)(i => (i*2).asUInt) assert(v.asUInt() === x.asUInt()) assert(v.asUInt() === u.asUInt()) |
