bslathi19/cocotbext-axi
1
0
Fork 0
Code Issues Actions Packages Projects Releases 5 Wiki Activity

Lazy logging

Browse Source
This commit is contained in:
Alex Forencich
2021-11-09 00:53:37 -08:00
parent 43de2ea9b0
commit 3fd016a84c
4 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cocotbext/axi/axi_master.py
View File

@@ -397,8 +397,9 @@ class AxiMasterWrite(Reset):
wuser = cmd.wuser wuser = cmd.wuser
self.log.info("Write start addr: 0x%08x awid: 0x%x prot: %s data: %s", if self.log.isEnabledFor(logging.INFO):
cmd.address, awid, cmd.prot, ' '.join((f'{c:02x}' for c in cmd.data))) self.log.info("Write start addr: 0x%08x awid: 0x%x prot: %s data: %s",
cmd.address, awid, cmd.prot, ' '.join((f'{c:02x}' for c in cmd.data)))
for k in range(cycles): for k in range(cycles):
start = cycle_offset start = cycle_offset
@@ -444,7 +445,7 @@ class AxiMasterWrite(Reset):
await self.aw_channel.send(aw) await self.aw_channel.send(aw)
self.log.info("Write burst start awid: 0x%x awaddr: 0x%08x awlen: %d awsize: %d awprot: %s", self.log.info("Write burst start awid: 0x%x awaddr: 0x%08x awlen: %d awsize: %d awprot: %s",
awid, cur_addr, burst_length-1, cmd.size, cmd.prot) awid, cur_addr, burst_length-1, cmd.size, cmd.prot)
n += 1 n += 1
@@ -511,7 +512,7 @@ class AxiMasterWrite(Reset):
user = None user = None
self.log.info("Write complete addr: 0x%08x prot: %s resp: %s length: %d", self.log.info("Write complete addr: 0x%08x prot: %s resp: %s length: %d",
cmd.address, cmd.prot, resp, cmd.length) cmd.address, cmd.prot, resp, cmd.length)
write_resp = AxiWriteResp(cmd.address, cmd.length, resp, user) write_resp = AxiWriteResp(cmd.address, cmd.length, resp, user)
@@ -795,7 +796,7 @@ class AxiMasterRead(Reset):
await self.ar_channel.send(ar) await self.ar_channel.send(ar)
self.log.info("Read burst start arid: 0x%x araddr: 0x%08x arlen: %d arsize: %d arprot: %s", self.log.info("Read burst start arid: 0x%x araddr: 0x%08x arlen: %d arsize: %d arprot: %s",
arid, cur_addr, burst_length-1, cmd.size, cmd.prot) arid, cur_addr, burst_length-1, cmd.size, cmd.prot)
cur_addr += num_bytes cur_addr += num_bytes
@@ -884,8 +885,9 @@ class AxiMasterRead(Reset):
if not self.ruser_present: if not self.ruser_present:
user = None user = None
self.log.info("Read complete addr: 0x%08x prot: %s resp: %s data: %s", if self.log.isEnabledFor(logging.INFO):
cmd.address, cmd.prot, resp, ' '.join((f'{c:02x}' for c in data))) self.log.info("Read complete addr: 0x%08x prot: %s resp: %s data: %s",
cmd.address, cmd.prot, resp, ' '.join((f'{c:02x}' for c in data)))
read_resp = AxiReadResp(cmd.address, data, resp, user) read_resp = AxiReadResp(cmd.address, data, resp, user)

14
cocotbext/axi/axi_ram.py
View File

@@ -112,7 +112,7 @@ class AxiRamWrite(Memory, Reset):
prot = AxiProt(getattr(aw, 'awprot', AxiProt.NONSECURE)) prot = AxiProt(getattr(aw, 'awprot', AxiProt.NONSECURE))
self.log.info("Write burst awid: 0x%x awaddr: 0x%08x awlen: %d awsize: %d awprot: %s", self.log.info("Write burst awid: 0x%x awaddr: 0x%08x awlen: %d awsize: %d awprot: %s",
awid, addr, length, size, prot) awid, addr, length, size, prot)
num_bytes = 2**size num_bytes = 2**size
assert 0 < num_bytes <= self.byte_lanes assert 0 < num_bytes <= self.byte_lanes
@@ -147,8 +147,9 @@ class AxiRamWrite(Memory, Reset):
data = data.to_bytes(self.byte_lanes, 'little') data = data.to_bytes(self.byte_lanes, 'little')
self.log.debug("Write word awid: 0x%x addr: 0x%08x wstrb: 0x%02x data: %s", if self.log.isEnabledFor(logging.DEBUG):
awid, cur_addr, strb, ' '.join((f'{c:02x}' for c in data))) self.log.debug("Write word awid: 0x%x addr: 0x%08x wstrb: 0x%02x data: %s",
awid, cur_addr, strb, ' '.join((f'{c:02x}' for c in data)))
for i in range(self.byte_lanes): for i in range(self.byte_lanes):
if strb & (1 << i): if strb & (1 << i):
@@ -246,7 +247,7 @@ class AxiRamRead(Memory, Reset):
prot = AxiProt(getattr(ar, 'arprot', AxiProt.NONSECURE)) prot = AxiProt(getattr(ar, 'arprot', AxiProt.NONSECURE))
self.log.info("Read burst arid: 0x%x araddr: 0x%08x arlen: %d arsize: %d arprot: %s", self.log.info("Read burst arid: 0x%x araddr: 0x%08x arlen: %d arsize: %d arprot: %s",
arid, addr, length, size, prot) arid, addr, length, size, prot)
num_bytes = 2**size num_bytes = 2**size
assert 0 < num_bytes <= self.byte_lanes assert 0 < num_bytes <= self.byte_lanes
@@ -281,8 +282,9 @@ class AxiRamRead(Memory, Reset):
await self.r_channel.send(r) await self.r_channel.send(r)
self.log.debug("Read word awid: 0x%x addr: 0x%08x data: %s", if self.log.isEnabledFor(logging.DEBUG):
arid, cur_addr, ' '.join((f'{c:02x}' for c in data))) self.log.debug("Read word awid: 0x%x addr: 0x%08x data: %s",
arid, cur_addr, ' '.join((f'{c:02x}' for c in data)))
if burst != AxiBurstType.FIXED: if burst != AxiBurstType.FIXED:
cur_addr += num_bytes cur_addr += num_bytes

14
cocotbext/axi/axil_master.py
View File

@@ -222,8 +222,9 @@ class AxiLiteMasterWrite(Reset):
offset = 0 offset = 0
self.log.info("Write start addr: 0x%08x prot: %s data: %s", if self.log.isEnabledFor(logging.INFO):
cmd.address, cmd.prot, ' '.join((f'{c:02x}' for c in cmd.data))) self.log.info("Write start addr: 0x%08x prot: %s data: %s",
cmd.address, cmd.prot, ' '.join((f'{c:02x}' for c in cmd.data)))
for k in range(cycles): for k in range(cycles):
start = 0 start = 0
@@ -271,7 +272,7 @@ class AxiLiteMasterWrite(Reset):
resp = cycle_resp resp = cycle_resp
self.log.info("Write complete addr: 0x%08x prot: %s resp: %s length: %d", self.log.info("Write complete addr: 0x%08x prot: %s resp: %s length: %d",
cmd.address, cmd.prot, resp, cmd.length) cmd.address, cmd.prot, resp, cmd.length)
write_resp = AxiLiteWriteResp(cmd.address, cmd.length, resp) write_resp = AxiLiteWriteResp(cmd.address, cmd.length, resp)
@@ -450,7 +451,7 @@ class AxiLiteMasterRead(Reset):
await self.int_read_resp_command_queue.put(resp_cmd) await self.int_read_resp_command_queue.put(resp_cmd)
self.log.info("Read start addr: 0x%08x prot: %s length: %d", self.log.info("Read start addr: 0x%08x prot: %s length: %d",
cmd.address, cmd.prot, cmd.length) cmd.address, cmd.prot, cmd.length)
for k in range(cycles): for k in range(cycles):
ar = self.ar_channel._transaction_obj() ar = self.ar_channel._transaction_obj()
@@ -493,8 +494,9 @@ class AxiLiteMasterRead(Reset):
for j in range(start, stop): for j in range(start, stop):
data.extend(bytearray([(cycle_data >> j*8) & 0xff])) data.extend(bytearray([(cycle_data >> j*8) & 0xff]))
self.log.info("Read complete addr: 0x%08x prot: %s resp: %s data: %s", if self.log.isEnabledFor(logging.INFO):
cmd.address, cmd.prot, resp, ' '.join((f'{c:02x}' for c in data))) self.log.info("Read complete addr: 0x%08x prot: %s resp: %s data: %s",
cmd.address, cmd.prot, resp, ' '.join((f'{c:02x}' for c in data)))
read_resp = AxiLiteReadResp(cmd.address, data, resp) read_resp = AxiLiteReadResp(cmd.address, data, resp)

10
cocotbext/axi/axil_ram.py
View File

@@ -113,8 +113,9 @@ class AxiLiteRamWrite(Memory, Reset):
data = data.to_bytes(self.byte_lanes, 'little') data = data.to_bytes(self.byte_lanes, 'little')
self.log.info("Write data awaddr: 0x%08x awprot: %s wstrb: 0x%02x data: %s", if self.log.isEnabledFor(logging.INFO):
addr, prot, strb, ' '.join((f'{c:02x}' for c in data))) self.log.info("Write data awaddr: 0x%08x awprot: %s wstrb: 0x%02x data: %s",
addr, prot, strb, ' '.join((f'{c:02x}' for c in data)))
for i in range(self.byte_lanes): for i in range(self.byte_lanes):
if strb & (1 << i): if strb & (1 << i):
@@ -204,8 +205,9 @@ class AxiLiteRamRead(Memory, Reset):
await self.r_channel.send(r) await self.r_channel.send(r)
self.log.info("Read data araddr: 0x%08x arprot: %s data: %s", if self.log.isEnabledFor(logging.INFO):
addr, prot, ' '.join((f'{c:02x}' for c in data))) self.log.info("Read data araddr: 0x%08x arprot: %s data: %s",
addr, prot, ' '.join((f'{c:02x}' for c in data)))
class AxiLiteRam(Memory): class AxiLiteRam(Memory):