test/test_axi: Minor cleanups.

This commit is contained in:
Florent Kermarrec 2022-02-17 15:13:05 +01:00
parent d0dc5c8d95
commit f62eca77e3
1 changed files with 27 additions and 30 deletions

View File

@ -1,7 +1,7 @@
# #
# This file is part of LiteX. # This file is part of LiteX.
# #
# Copyright (c) 2019 Florent Kermarrec <florent@enjoy-digital.fr> # Copyright (c) 2019-2022 Florent Kermarrec <florent@enjoy-digital.fr>
# SPDX-License-Identifier: BSD-2-Clause # SPDX-License-Identifier: BSD-2-Clause
import unittest import unittest
@ -54,12 +54,9 @@ class Access(Burst):
self.id = id self.id = id
class Write(Access): class Write(Access): pass
pass
class Read(Access): pass
class Read(Access):
pass
# TestAXI ------------------------------------------------------------------------------------------ # TestAXI ------------------------------------------------------------------------------------------
@ -98,12 +95,12 @@ class TestAXI(unittest.TestCase):
self.errors += 1 self.errors += 1
yield yield
# dut # DUT
ax_burst = stream.Endpoint(ax_description(32, 32)) ax_burst = stream.Endpoint(ax_description(32, 32))
ax_beat = stream.Endpoint(ax_description(32, 32)) ax_beat = stream.Endpoint(ax_description(32, 32))
dut = AXIBurst2Beat(ax_burst, ax_beat) dut = AXIBurst2Beat(ax_burst, ax_beat)
# generate dut input (bursts) # Generate DUT input (bursts).
prng = random.Random(42) prng = random.Random(42)
bursts = [] bursts = []
for i in range(32): for i in range(32):
@ -112,12 +109,12 @@ class TestAXI(unittest.TestCase):
bursts.append(Burst(4, BURST_WRAP, 4-1, log2_int(2))) bursts.append(Burst(4, BURST_WRAP, 4-1, log2_int(2)))
bursts.append(Burst(0x80000160, BURST_WRAP, 0x3, 0b100)) bursts.append(Burst(0x80000160, BURST_WRAP, 0x3, 0b100))
# generate expected dut output (beats for reference) # Generate expected DUT output (beats for reference).
beats = [] beats = []
for burst in bursts: for burst in bursts:
beats += burst.to_beats() beats += burst.to_beats()
# simulation # Simulation
generators = [ generators = [
bursts_generator(ax_burst, bursts), bursts_generator(ax_burst, bursts),
beats_checker(ax_beat, beats) beats_checker(ax_beat, beats)
@ -128,17 +125,17 @@ class TestAXI(unittest.TestCase):
def _test_axi2wishbone(self, def _test_axi2wishbone(self,
naccesses=16, simultaneous_writes_reads=False, naccesses=16, simultaneous_writes_reads=False,
# random: 0: min (no random), 100: max. # Random: 0: min (no random), 100: max.
# burst randomness # Burst randomness.
id_rand_enable = False, id_rand_enable = False,
len_rand_enable = False, len_rand_enable = False,
data_rand_enable = False, data_rand_enable = False,
# flow valid randomness # Flow valid randomness.
aw_valid_random = 0, aw_valid_random = 0,
w_valid_random = 0, w_valid_random = 0,
ar_valid_random = 0, ar_valid_random = 0,
r_valid_random = 0, r_valid_random = 0,
# flow ready randomness # Flow ready randomness.
w_ready_random = 0, w_ready_random = 0,
b_ready_random = 0, b_ready_random = 0,
r_ready_random = 0 r_ready_random = 0
@ -149,7 +146,7 @@ class TestAXI(unittest.TestCase):
for write in writes: for write in writes:
while prng.randrange(100) < aw_valid_random: while prng.randrange(100) < aw_valid_random:
yield yield
# send command # Send command.
yield axi_port.aw.valid.eq(1) yield axi_port.aw.valid.eq(1)
yield axi_port.aw.addr.eq(write.addr<<2) yield axi_port.aw.addr.eq(write.addr<<2)
yield axi_port.aw.burst.eq(write.type) yield axi_port.aw.burst.eq(write.type)
@ -168,7 +165,7 @@ class TestAXI(unittest.TestCase):
for i, data in enumerate(write.data): for i, data in enumerate(write.data):
while prng.randrange(100) < w_valid_random: while prng.randrange(100) < w_valid_random:
yield yield
# send data # Send data.
yield axi_port.w.valid.eq(1) yield axi_port.w.valid.eq(1)
if (i == (len(write.data) - 1)): if (i == (len(write.data) - 1)):
yield axi_port.w.last.eq(1) yield axi_port.w.last.eq(1)
@ -204,7 +201,7 @@ class TestAXI(unittest.TestCase):
for read in reads: for read in reads:
while prng.randrange(100) < ar_valid_random: while prng.randrange(100) < ar_valid_random:
yield yield
# send command # Send command.
yield axi_port.ar.valid.eq(1) yield axi_port.ar.valid.eq(1)
yield axi_port.ar.addr.eq(read.addr<<2) yield axi_port.ar.addr.eq(read.addr<<2)
yield axi_port.ar.burst.eq(read.type) yield axi_port.ar.burst.eq(read.type)
@ -225,7 +222,7 @@ class TestAXI(unittest.TestCase):
yield yield
for read in reads: for read in reads:
for i, data in enumerate(read.data): for i, data in enumerate(read.data):
# wait data / response # Wait data / response.
yield axi_port.r.ready.eq(0) yield axi_port.r.ready.eq(0)
yield yield
while (yield axi_port.r.valid) == 0: while (yield axi_port.r.valid) == 0:
@ -245,7 +242,7 @@ class TestAXI(unittest.TestCase):
if (yield axi_port.r.last) != 0: if (yield axi_port.r.last) != 0:
self.reads_last_errors += 1 self.reads_last_errors += 1
# dut # DUT
class DUT(Module): class DUT(Module):
def __init__(self): def __init__(self):
self.axi = AXIInterface(data_width=32, address_width=32, id_width=8) self.axi = AXIInterface(data_width=32, address_width=32, id_width=8)
@ -259,25 +256,25 @@ class TestAXI(unittest.TestCase):
dut = DUT() dut = DUT()
# generate writes/reads # Generate writes/reads.
prng = random.Random(42) prng = random.Random(42)
writes = [] writes = []
offset = 1 offset = 1
for i in range(naccesses): for i in range(naccesses):
_id = prng.randrange(2**8) if id_rand_enable else i _id = prng.randrange(2**8) if id_rand_enable else i
_len = prng.randrange(32) if len_rand_enable else i _len = prng.randrange(32) if len_rand_enable else i
_data = [prng.randrange(2**32) if data_rand_enable else j for j in range(_len + 1)] _data = [prng.randrange(2**32) if data_rand_enable else j for j in range(_len + 1)]
writes.append(Write(offset, _data, _id, type=BURST_INCR, len=_len, size=log2_int(32//8))) writes.append(Write(offset, _data, _id, type=BURST_INCR, len=_len, size=log2_int(32//8)))
offset += _len + 1 offset += _len + 1
# dummy reads to ensure datas have been written before the effective reads start. # Dummy reads to ensure datas have been written before the effective reads start.
dummy_reads = [Read(1023, [0], 0, type=BURST_FIXED, len=0, size=log2_int(32//8)) for _ in range(32)] dummy_reads = [Read(1023, [0], 0, type=BURST_FIXED, len=0, size=log2_int(32//8)) for _ in range(32)]
reads = writes reads = writes
# simulation # Simulation
if simultaneous_writes_reads: if simultaneous_writes_reads:
dut.axi.reads_enable = True dut.axi.reads_enable = True
else: else:
dut.axi.reads_enable = False # will be set by writes_data_generator dut.axi.reads_enable = False # Will be set by writes_data_generator.
generators = [ generators = [
writes_cmd_generator(dut.axi, writes), writes_cmd_generator(dut.axi, writes),
writes_data_generator(dut.axi, writes), writes_data_generator(dut.axi, writes),
@ -286,16 +283,16 @@ class TestAXI(unittest.TestCase):
reads_response_data_generator(dut.axi, reads) reads_response_data_generator(dut.axi, reads)
] ]
run_simulation(dut, generators) run_simulation(dut, generators)
self.assertEqual(self.writes_id_errors, 0) self.assertEqual(self.writes_id_errors, 0)
self.assertEqual(self.reads_data_errors, 0) self.assertEqual(self.reads_data_errors, 0)
self.assertEqual(self.reads_id_errors, 0) self.assertEqual(self.reads_id_errors, 0)
self.assertEqual(self.reads_last_errors, 0) self.assertEqual(self.reads_last_errors, 0)
# test with no randomness # Test with no randomness.
def test_axi2wishbone_writes_then_reads_no_random(self): def test_axi2wishbone_writes_then_reads_no_random(self):
self._test_axi2wishbone(simultaneous_writes_reads=False) self._test_axi2wishbone(simultaneous_writes_reads=False)
# test randomness one parameter at a time # Test randomness one parameter at a time.
def test_axi2wishbone_writes_then_reads_random_bursts(self): def test_axi2wishbone_writes_then_reads_random_bursts(self):
self._test_axi2wishbone( self._test_axi2wishbone(
simultaneous_writes_reads = False, simultaneous_writes_reads = False,
@ -324,7 +321,7 @@ class TestAXI(unittest.TestCase):
def test_axi2wishbone_random_r_valid(self): def test_axi2wishbone_random_r_valid(self):
self._test_axi2wishbone(r_valid_random=90) self._test_axi2wishbone(r_valid_random=90)
# now let's stress things a bit... :) # Now let's stress things a bit... :)
def test_axi2wishbone_random_all(self): def test_axi2wishbone_random_all(self):
self._test_axi2wishbone( self._test_axi2wishbone(
simultaneous_writes_reads = False, simultaneous_writes_reads = False,