diff --git a/tests/axi/test_axi.py b/tests/axi/test_axi.py index e0a74ec..11fe3d8 100644 --- a/tests/axi/test_axi.py +++ b/tests/axi/test_axi.py @@ -31,6 +31,7 @@ import cocotb_test.simulator import pytest import cocotb +from cocotb.log import SimLog from cocotb.clock import Clock from cocotb.triggers import RisingEdge, Timer from cocotb.regression import TestFactory @@ -41,6 +42,9 @@ class TB(object): def __init__(self, dut): self.dut = dut + self.log = SimLog(f"cocotb.tb") + self.log.setLevel(logging.DEBUG) + cocotb.fork(Clock(dut.clk, 2, units="ns").start()) self.axi_master = AxiMaster(dut, "axi", dut.clk, dut.rst) @@ -93,7 +97,7 @@ async def run_test_write(dut, idle_inserter=None, backpressure_inserter=None, si for length in list(range(1,byte_width*2))+[1024]: for offset in list(range(byte_width))+list(range(4096-byte_width,4096)): - print(f"length {length}, offset {offset}") + tb.log.info(f"length {length}, offset {offset}") addr = offset+0x1000 test_data = bytearray([x%256 for x in range(length)]) @@ -101,7 +105,7 @@ async def run_test_write(dut, idle_inserter=None, backpressure_inserter=None, si await tb.axi_master.write(addr, test_data, size=size) - tb.axi_ram.hexdump((addr&0xfffffff0)-16, (((addr&0xf)+length-1)&0xfffffff0)+48) + tb.log.debug(tb.axi_ram.hexdump_str((addr&0xfffffff0)-16, (((addr&0xf)+length-1)&0xfffffff0)+48)) assert tb.axi_ram.read_mem(addr, length) == test_data assert tb.axi_ram.read_mem(addr-1, 1) == b'\xaa' @@ -127,7 +131,7 @@ async def run_test_read(dut, idle_inserter=None, backpressure_inserter=None, siz for length in list(range(1,byte_width*2))+[1024]: for offset in list(range(byte_width))+list(range(4096-byte_width,4096)): - print(f"length {length}, offset {offset}") + tb.log.info(f"length {length}, offset {offset}") addr = offset+0x1000 test_data = bytearray([x%256 for x in range(length)]) diff --git a/tests/axil/test_axil.py b/tests/axil/test_axil.py index 4d1e87d..55d958a 100644 --- a/tests/axil/test_axil.py +++ b/tests/axil/test_axil.py @@ -23,6 +23,7 @@ THE SOFTWARE. """ import itertools +import logging import os import random @@ -30,6 +31,7 @@ import cocotb_test.simulator import pytest import cocotb +from cocotb.log import SimLog from cocotb.clock import Clock from cocotb.triggers import RisingEdge, Timer from cocotb.regression import TestFactory @@ -40,6 +42,9 @@ class TB(object): def __init__(self, dut): self.dut = dut + self.log = SimLog(f"cocotb.tb") + self.log.setLevel(logging.DEBUG) + cocotb.fork(Clock(dut.clk, 2, units="ns").start()) self.axil_master = AxiLiteMaster(dut, "axil", dut.clk, dut.rst) @@ -85,7 +90,7 @@ async def run_test_write(dut, data_in=None, idle_inserter=None, backpressure_ins for length in range(1,byte_width*2): for offset in range(byte_width): - print(f"length {length}, offset {offset}") + tb.log.info(f"length {length}, offset {offset}") addr = offset+0x1000 test_data = bytearray([x%256 for x in range(length)]) @@ -93,7 +98,7 @@ async def run_test_write(dut, data_in=None, idle_inserter=None, backpressure_ins await tb.axil_master.write(addr, test_data) - tb.axil_ram.hexdump((addr&0xfffffff0)-16, (((addr&0xf)+length-1)&0xfffffff0)+48) + tb.log.debug(tb.axil_ram.hexdump_str((addr&0xfffffff0)-16, (((addr&0xf)+length-1)&0xfffffff0)+48)) assert tb.axil_ram.read_mem(addr, length) == test_data assert tb.axil_ram.read_mem(addr-1, 1) == b'\xaa' @@ -115,7 +120,7 @@ async def run_test_read(dut, data_in=None, idle_inserter=None, backpressure_inse for length in range(1,byte_width*2): for offset in range(byte_width): - print(f"length {length}, offset {offset}") + tb.log.info(f"length {length}, offset {offset}") addr = offset+0x1000 test_data = bytearray([x%256 for x in range(length)]) diff --git a/tests/axis/test_axis.py b/tests/axis/test_axis.py index 7b32851..67f1d4d 100644 --- a/tests/axis/test_axis.py +++ b/tests/axis/test_axis.py @@ -24,12 +24,14 @@ THE SOFTWARE. """ import itertools +import logging import os import cocotb_test.simulator import pytest import cocotb +from cocotb.log import SimLog from cocotb.clock import Clock from cocotb.triggers import RisingEdge from cocotb.regression import TestFactory @@ -40,6 +42,9 @@ class TB(object): def __init__(self, dut): self.dut = dut + self.log = SimLog(f"cocotb.tb") + self.log.setLevel(logging.DEBUG) + cocotb.fork(Clock(dut.clk, 2, units="ns").start()) self.source = AxiStreamSource(dut, "axis", dut.clk, dut.rst)