Cast to int instead of using .integer

Signed-off-by: Alex Forencich <alex@alexforencich.com>
This commit is contained in:
Alex Forencich
2025-09-07 11:25:34 -07:00
parent 40908b1b92
commit 6a5faf9ebf
28 changed files with 95 additions and 95 deletions

View File

@@ -681,7 +681,7 @@ class BaseRSerdesSink:
self.gbx_seq = (self.gbx_seq + 1) % self.gbx_seq_len
if self.gbx_sync is not None:
if self.gbx_sync.value.integer:
if int(self.gbx_sync.value):
self.gbx_seq = 0
self.gbx_bit_cnt = max(self.gbx_bit_cnt - self.gbx_out_bits, 0)
@@ -701,7 +701,7 @@ class BaseRSerdesSink:
self.gbx_sync.value = 1
if self.data_valid is not None:
if not self.data_valid.value.integer:
if not int(self.data_valid.value):
# stall
if self.gbx_seq_len and not sync_bad:
sync_bad = True
@@ -710,8 +710,8 @@ class BaseRSerdesSink:
sync_bad = False
data_in = self.data.value.integer
hdr_in = self.hdr.value.integer
data_in = int(self.data.value)
hdr_in = int(self.hdr.value)
if self.reverse:
# bit reverse

View File

@@ -194,7 +194,7 @@ async def run_test_underrun(dut, ifg=12, enable_gen=None, mii_sel=False):
for k in range(200 if mii_sel else 100):
while True:
await RisingEdge(dut.clk)
if dut.clk_enable.value.integer:
if int(dut.clk_enable.value):
break
tb.source.pause = True
@@ -202,7 +202,7 @@ async def run_test_underrun(dut, ifg=12, enable_gen=None, mii_sel=False):
for k in range(10):
while True:
await RisingEdge(dut.clk)
if dut.clk_enable.value.integer:
if int(dut.clk_enable.value):
break
tb.source.pause = False

View File

@@ -470,7 +470,7 @@ async def run_test_lfc(dut, ifg=12):
dut.tx_lfc_req.value = 0
while not dut.rx_lfc_req.value.integer:
while not int(dut.rx_lfc_req.value):
await RisingEdge(dut.tx_clk)
for k in range(200):

View File

@@ -96,7 +96,7 @@ async def run_test_rx(dut, payload_lengths=None, payload_data=None, ifg=12):
await tb.reset()
tb.log.info("Wait for PTP CDC lock")
while not dut.uut.rx_ptp_locked.value.integer:
while not int(dut.uut.rx_ptp_locked.value):
await RisingEdge(dut.rx_clk)
for k in range(1000):
await RisingEdge(dut.rx_clk)
@@ -148,7 +148,7 @@ async def run_test_tx(dut, payload_lengths=None, payload_data=None, ifg=12):
await tb.reset()
tb.log.info("Wait for PTP CDC lock")
while not dut.uut.tx_ptp_locked.value.integer:
while not int(dut.uut.tx_ptp_locked.value):
await RisingEdge(dut.tx_clk)
for k in range(1000):
await RisingEdge(dut.tx_clk)
@@ -201,7 +201,7 @@ async def run_test_tx_alignment(dut, payload_data=None, ifg=12):
await tb.reset()
tb.log.info("Wait for PTP CDC lock")
while not dut.uut.tx_ptp_locked.value.integer:
while not int(dut.uut.tx_ptp_locked.value):
await RisingEdge(dut.tx_clk)
for k in range(1000):
await RisingEdge(dut.tx_clk)

View File

@@ -292,7 +292,7 @@ async def run_test_tx_underrun(dut, ifg=12, enable_gen=None, mii_sel=False):
for k in range(200 if mii_sel else 100):
while True:
await RisingEdge(dut.tx_clk)
if dut.tx_clk_enable.value.integer:
if int(dut.tx_clk_enable.value):
break
tb.axis_source.pause = True
@@ -300,7 +300,7 @@ async def run_test_tx_underrun(dut, ifg=12, enable_gen=None, mii_sel=False):
for k in range(10):
while True:
await RisingEdge(dut.tx_clk)
if dut.tx_clk_enable.value.integer:
if int(dut.tx_clk_enable.value):
break
tb.axis_source.pause = False
@@ -539,7 +539,7 @@ async def run_test_lfc(dut, ifg=12, enable_gen=None, mii_sel=True):
dut.tx_lfc_req.value = 0
while not dut.rx_lfc_req.value.integer:
while not int(dut.rx_lfc_req.value):
await RisingEdge(dut.tx_clk)
for k in range(1000):

View File

@@ -406,7 +406,7 @@ async def run_test_lfc(dut, ifg=12, speed=1000e6):
dut.tx_lfc_req.value = 0
while not dut.rx_lfc_req.value.integer:
while not int(dut.rx_lfc_req.value):
await RisingEdge(dut.tx_clk)
for k in range(1000):

View File

@@ -254,7 +254,7 @@ async def run_test_tx_underrun(dut, ifg=12, speed=1000e6):
for k in range(200 if speed != 1000e6 else 100):
while True:
await RisingEdge(dut.tx_clk)
if dut.uut.mac_gmii_tx_clk_en.value.integer:
if int(dut.uut.mac_gmii_tx_clk_en.value):
break
tb.axis_source.pause = True
@@ -262,7 +262,7 @@ async def run_test_tx_underrun(dut, ifg=12, speed=1000e6):
for k in range(10):
while True:
await RisingEdge(dut.tx_clk)
if dut.uut.mac_gmii_tx_clk_en.value.integer:
if int(dut.uut.mac_gmii_tx_clk_en.value):
break
tb.axis_source.pause = False
@@ -409,7 +409,7 @@ async def run_test_lfc(dut, ifg=12, speed=1000e6):
dut.tx_lfc_req.value = 0
while not dut.rx_lfc_req.value.integer:
while not int(dut.rx_lfc_req.value):
await RisingEdge(dut.tx_clk)
for k in range(1000):

View File

@@ -684,7 +684,7 @@ async def run_test_lfc(dut, port=0, ifg=12):
dut.tx_lfc_req.value = 0
while not dut.rx_lfc_req.value.integer:
while not int(dut.rx_lfc_req.value):
await RisingEdge(dut.xcvr_ctrl_clk)
for k in range(200):

View File

@@ -370,7 +370,7 @@ async def run_test_lfc(dut, ifg=12, speed=1000e6):
dut.tx_lfc_req.value = 0
while not dut.rx_lfc_req.value.integer:
while not int(dut.rx_lfc_req.value):
await RisingEdge(dut.tx_clk)
for k in range(1000):

View File

@@ -599,7 +599,7 @@ async def run_test_lfc(dut, gbx_cfg=None, ifg=12):
dut.tx_lfc_req.value = 0
while not dut.rx_lfc_req.value.integer:
while not int(dut.rx_lfc_req.value):
await RisingEdge(dut.tx_clk)
for k in range(200):

View File

@@ -138,11 +138,11 @@ async def run_test_rx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None
await tb.reset()
tb.log.info("Wait for block lock")
while not dut.rx_block_lock.value.integer:
while not int(dut.rx_block_lock.value):
await RisingEdge(dut.rx_clk)
tb.log.info("Wait for PTP CDC lock")
while not dut.uut.rx_ptp_locked.value.integer:
while not int(dut.uut.rx_ptp_locked.value):
await RisingEdge(dut.rx_clk)
for k in range(1000):
await RisingEdge(dut.rx_clk)
@@ -205,7 +205,7 @@ async def run_test_tx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None
await tb.reset()
tb.log.info("Wait for PTP CDC lock")
while not dut.uut.tx_ptp_locked.value.integer:
while not int(dut.uut.tx_ptp_locked.value):
await RisingEdge(dut.tx_clk)
for k in range(1000):
await RisingEdge(dut.tx_clk)
@@ -269,7 +269,7 @@ async def run_test_tx_alignment(dut, gbx_cfg=None, payload_data=None, ifg=12):
await tb.reset()
tb.log.info("Wait for PTP CDC lock")
while not dut.uut.tx_ptp_locked.value.integer:
while not int(dut.uut.tx_ptp_locked.value):
await RisingEdge(dut.tx_clk)
for k in range(1000):
await RisingEdge(dut.tx_clk)
@@ -362,10 +362,10 @@ async def run_test_rx_frame_sync(dut, gbx_cfg=None):
await tb.reset()
tb.log.info("Wait for block lock")
while not dut.rx_block_lock.value.integer:
while not int(dut.rx_block_lock.value):
await RisingEdge(dut.rx_clk)
assert dut.rx_block_lock.value.integer
assert int(dut.rx_block_lock.value)
tb.log.info("Change offset")
tb.serdes_source.bit_offset = 33
@@ -374,20 +374,20 @@ async def run_test_rx_frame_sync(dut, gbx_cfg=None):
await RisingEdge(dut.rx_clk)
tb.log.info("Check for lock lost")
assert not dut.rx_block_lock.value.integer
assert dut.rx_high_ber.value.integer
assert not int(dut.rx_block_lock.value)
assert int(dut.rx_high_ber.value)
for k in range(800):
await RisingEdge(dut.rx_clk)
tb.log.info("Check for block lock")
assert dut.rx_block_lock.value.integer
assert int(dut.rx_block_lock.value)
for k in range(300):
await RisingEdge(dut.rx_clk)
tb.log.info("Check for high BER deassert")
assert not dut.rx_high_ber.value.integer
assert not int(dut.rx_high_ber.value)
await RisingEdge(dut.rx_clk)
await RisingEdge(dut.rx_clk)

View File

@@ -95,11 +95,11 @@ class TB:
rx_frame = await self.mcf_sink.recv()
data = bytearray()
data.extend(rx_frame.eth_dst.integer.to_bytes(6, 'big'))
data.extend(rx_frame.eth_src.integer.to_bytes(6, 'big'))
data.extend(rx_frame.eth_type.integer.to_bytes(2, 'big'))
data.extend(rx_frame.opcode.integer.to_bytes(2, 'big'))
data.extend(rx_frame.params.integer.to_bytes(44, 'little'))
data.extend(int(rx_frame.eth_dst).to_bytes(6, 'big'))
data.extend(int(rx_frame.eth_src).to_bytes(6, 'big'))
data.extend(int(rx_frame.eth_type).to_bytes(2, 'big'))
data.extend(int(rx_frame.opcode).to_bytes(2, 'big'))
data.extend(int(rx_frame.params).to_bytes(44, 'little'))
return Ether(data)

View File

@@ -81,11 +81,11 @@ class TB:
rx_frame = await self.mcf_sink.recv()
data = bytearray()
data.extend(rx_frame.eth_dst.integer.to_bytes(6, 'big'))
data.extend(rx_frame.eth_src.integer.to_bytes(6, 'big'))
data.extend(rx_frame.eth_type.integer.to_bytes(2, 'big'))
data.extend(rx_frame.opcode.integer.to_bytes(2, 'big'))
data.extend(rx_frame.params.integer.to_bytes(44, 'little'))
data.extend(int(rx_frame.eth_dst).to_bytes(6, 'big'))
data.extend(int(rx_frame.eth_src).to_bytes(6, 'big'))
data.extend(int(rx_frame.eth_type).to_bytes(2, 'big'))
data.extend(int(rx_frame.opcode).to_bytes(2, 'big'))
data.extend(int(rx_frame.params).to_bytes(44, 'little'))
return Ether(data)