1
0

[tilelink2] Make map generation in RRTests a def so that multiple RRTests can be instantiated as part of the same unit test suite. (#356)

This commit is contained in:
Henry Cook 2016-09-27 18:06:21 -07:00 committed by GitHub
parent c45cc76cef
commit 81123f84c9

View File

@ -182,7 +182,7 @@ object RRTest0Map
def ee(bits: Int) = combo(bits, delay(11), delay(11)) def ee(bits: Int) = combo(bits, delay(11), delay(11))
// All fields must respect byte alignment, or else it won't behave like an SRAM // All fields must respect byte alignment, or else it won't behave like an SRAM
val map = Seq( def map = Seq(
0 -> Seq(aa(8), ar(8), ad(8), ae(8)), 0 -> Seq(aa(8), ar(8), ad(8), ae(8)),
4 -> Seq(ra(8), rr(8), rd(8), re(8)), 4 -> Seq(ra(8), rr(8), rd(8), re(8)),
8 -> Seq(da(8), dr(8), dd(8), de(8)), 8 -> Seq(da(8), dr(8), dd(8), de(8)),
@ -202,7 +202,7 @@ object RRTest1Map
def bp(bits: Int) = request(bits, busy, pipe(3)) def bp(bits: Int) = request(bits, busy, pipe(3))
def bb(bits: Int) = request(bits, busy, busy) def bb(bits: Int) = request(bits, busy, busy)
val map = RRTest0Map.map.take(6) ++ Seq( def map = RRTest0Map.map.take(6) ++ Seq(
24 -> Seq(pp(8), pb(8), bp(8), bb(8)), 24 -> Seq(pp(8), pb(8), bp(8), bb(8)),
28 -> Seq(pp(3), pb(5), bp(1), bb(7), pb(5), bp(3), pp(4), bb(4))) 28 -> Seq(pp(3), pb(5), bp(1), bb(7), pb(5), bp(3), pp(4), bb(4)))
} }