test/coding: use new API

This commit is contained in:
Sebastien Bourdeauducq 2015-09-17 17:22:59 +08:00
parent 12cd390c0b
commit 4a3a1bc5b0
1 changed files with 56 additions and 49 deletions

View File

@ -3,11 +3,11 @@ import unittest
from migen import * from migen import *
from migen.genlib.coding import * from migen.genlib.coding import *
from migen.test.support import SimCase, SimBench from migen.test.support import SimCase
class EncCase(SimCase, unittest.TestCase): class EncCase(SimCase, unittest.TestCase):
class TestBench(SimBench): class TestBench(Module):
def __init__(self): def __init__(self):
self.submodules.dut = Encoder(8) self.submodules.dut = Encoder(8)
@ -18,18 +18,20 @@ class EncCase(SimCase, unittest.TestCase):
def test_run_sequence(self): def test_run_sequence(self):
seq = list(range(1<<8)) seq = list(range(1<<8))
def cb(tb, tbp): def gen():
for _ in range(256):
if seq: if seq:
tbp.dut.i = seq.pop(0) yield self.tb.dut.i, seq.pop(0)
if tbp.dut.n: if (yield self.tb.dut.n):
self.assertNotIn(tbp.dut.i, [1<<i for i in range(8)]) self.assertNotIn((yield self.tb.dut.i), [1<<i for i in range(8)])
else: else:
self.assertEqual(tbp.dut.i, 1<<tbp.dut.o) self.assertEqual((yield self.tb.dut.i), 1<<(yield self.tb.dut.o))
self.run_with(cb, 256) yield
self.run_with(gen())
class PrioEncCase(SimCase, unittest.TestCase): class PrioEncCase(SimCase, unittest.TestCase):
class TestBench(SimBench): class TestBench(Module):
def __init__(self): def __init__(self):
self.submodules.dut = PriorityEncoder(8) self.submodules.dut = PriorityEncoder(8)
@ -40,22 +42,24 @@ class PrioEncCase(SimCase, unittest.TestCase):
def test_run_sequence(self): def test_run_sequence(self):
seq = list(range(1<<8)) seq = list(range(1<<8))
def cb(tb, tbp): def gen():
for _ in range(256):
if seq: if seq:
tbp.dut.i = seq.pop(0) yield self.tb.dut.i, seq.pop(0)
i = tbp.dut.i i = yield self.tb.dut.i
if tbp.dut.n: if (yield self.tb.dut.n):
self.assertEqual(i, 0) self.assertEqual(i, 0)
else: else:
o = tbp.dut.o o = yield self.tb.dut.o
if o > 0: if o > 0:
self.assertEqual(i & 1<<(o - 1), 0) self.assertEqual(i & 1<<(o - 1), 0)
self.assertGreaterEqual(i, 1<<o) self.assertGreaterEqual(i, 1<<o)
self.run_with(cb, 256) yield
self.run_with(gen())
class DecCase(SimCase, unittest.TestCase): class DecCase(SimCase, unittest.TestCase):
class TestBench(SimBench): class TestBench(Module):
def __init__(self): def __init__(self):
self.submodules.dut = Decoder(8) self.submodules.dut = Decoder(8)
@ -66,22 +70,23 @@ class DecCase(SimCase, unittest.TestCase):
def test_run_sequence(self): def test_run_sequence(self):
seq = list(range(8*2)) seq = list(range(8*2))
def cb(tb, tbp): def gen():
for _ in range(256):
if seq: if seq:
i = seq.pop() i = seq.pop()
tbp.dut.i = i//2 yield self.tb.dut.i, i//2
tbp.dut.n = i%2 yield self.tb.dut.n, i%2
i = tbp.dut.i i = yield self.tb.dut.i
o = tbp.dut.o o = yield self.tb.dut.o
if tbp.dut.n: if (yield self.tb.dut.n):
self.assertEqual(o, 0) self.assertEqual(o, 0)
else: else:
self.assertEqual(o, 1<<i) self.assertEqual(o, 1<<i)
self.run_with(cb, 256) self.run_with(gen())
class SmallPrioEncCase(SimCase, unittest.TestCase): class SmallPrioEncCase(SimCase, unittest.TestCase):
class TestBench(SimBench): class TestBench(Module):
def __init__(self): def __init__(self):
self.submodules.dut = PriorityEncoder(1) self.submodules.dut = PriorityEncoder(1)
@ -92,15 +97,17 @@ class SmallPrioEncCase(SimCase, unittest.TestCase):
def test_run_sequence(self): def test_run_sequence(self):
seq = list(range(1)) seq = list(range(1))
def cb(tb, tbp): def gen():
for _ in range(5):
if seq: if seq:
tbp.dut.i = seq.pop(0) yield self.tb.dut.i, seq.pop(0)
i = tbp.dut.i i = yield self.tb.dut.i
if tbp.dut.n: if (yield self.tb.dut.n):
self.assertEqual(i, 0) self.assertEqual(i, 0)
else: else:
o = tbp.dut.o o = yield self.tb.dut.o
if o > 0: if o > 0:
self.assertEqual(i & 1<<(o - 1), 0) self.assertEqual(i & 1<<(o - 1), 0)
self.assertGreaterEqual(i, 1<<o) self.assertGreaterEqual(i, 1<<o)
self.run_with(cb, 5) yield
self.run_with(gen())