From b06321186a47c5a1ee7aa9608617a3667f94bd53 Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Thu, 23 Jul 2026 17:40:21 -0700 Subject: [PATCH] eth: Testbench pipeline delay handling cleanup Signed-off-by: Alex Forencich --- .../test_taxi_eth_mac_1g_basex_us.py | 8 +++---- .../test_taxi_eth_mac_25g_us.py | 24 +++++++++---------- .../test_taxi_eth_mac_phy_10g.py | 12 +++++----- .../test_taxi_eth_mac_phy_10g_fifo.py | 12 +++++----- .../test_taxi_eth_mac_phy_1g_basex.py | 8 +++---- .../test_taxi_eth_mac_phy_1g_basex_fifo.py | 8 +++---- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/eth/tb/taxi_eth_mac_1g_basex_us/test_taxi_eth_mac_1g_basex_us.py b/src/eth/tb/taxi_eth_mac_1g_basex_us/test_taxi_eth_mac_1g_basex_us.py index 60a2fa3..c1f2495 100644 --- a/src/eth/tb/taxi_eth_mac_1g_basex_us/test_taxi_eth_mac_1g_basex_us.py +++ b/src/eth/tb/taxi_eth_mac_1g_basex_us/test_taxi_eth_mac_1g_basex_us.py @@ -223,9 +223,9 @@ async def run_test_regs(dut): async def run_test_rx(dut, port=0, payload_lengths=None, payload_data=None, ifg=12): if dut.COMBINED_MAC_PCS.value: - pipe_delay = 3 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 1 + 1 else: - pipe_delay = 3 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 1 + 1 tb = TB(dut) @@ -294,9 +294,9 @@ async def run_test_rx(dut, port=0, payload_lengths=None, payload_data=None, ifg= async def run_test_tx(dut, port=0, payload_lengths=None, payload_data=None, ifg=12): if dut.COMBINED_MAC_PCS.value: - pipe_delay = 4 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 0 + 1 else: - pipe_delay = 4 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 0 + 1 tb = TB(dut) diff --git a/src/eth/tb/taxi_eth_mac_25g_us/test_taxi_eth_mac_25g_us.py b/src/eth/tb/taxi_eth_mac_25g_us/test_taxi_eth_mac_25g_us.py index 2e133dc..f7c9167 100644 --- a/src/eth/tb/taxi_eth_mac_25g_us/test_taxi_eth_mac_25g_us.py +++ b/src/eth/tb/taxi_eth_mac_25g_us/test_taxi_eth_mac_25g_us.py @@ -234,14 +234,14 @@ async def run_test_rx(dut, port=0, payload_lengths=None, payload_data=None, ifg= if dut.DATA_W.value == 64: if dut.COMBINED_MAC_PCS.value: - pipe_delay = 3 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 1 + 1 else: - pipe_delay = 4 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 2 + 1 else: if dut.COMBINED_MAC_PCS.value: - pipe_delay = 4 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 2 + 1 else: - pipe_delay = 5 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 3 + 1 tb = TB(dut) @@ -311,14 +311,14 @@ async def run_test_tx(dut, port=0, payload_lengths=None, payload_data=None, ifg= if dut.DATA_W.value == 64: if dut.COMBINED_MAC_PCS.value: - pipe_delay = 6 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 else: - pipe_delay = 6 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 else: if dut.COMBINED_MAC_PCS.value: - pipe_delay = 6 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 else: - pipe_delay = 8 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 4 + 1 tb = TB(dut) @@ -384,14 +384,14 @@ async def run_test_tx_alignment(dut, port=0, payload_data=None, ifg=12): if dut.DATA_W.value == 64: if dut.COMBINED_MAC_PCS.value: - pipe_delay = 6 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 else: - pipe_delay = 6 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 else: if dut.COMBINED_MAC_PCS.value: - pipe_delay = 7 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 else: - pipe_delay = 8 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 4 + 1 tb = TB(dut) diff --git a/src/eth/tb/taxi_eth_mac_phy_10g/test_taxi_eth_mac_phy_10g.py b/src/eth/tb/taxi_eth_mac_phy_10g/test_taxi_eth_mac_phy_10g.py index 3dac3a4..14bea07 100644 --- a/src/eth/tb/taxi_eth_mac_phy_10g/test_taxi_eth_mac_phy_10g.py +++ b/src/eth/tb/taxi_eth_mac_phy_10g/test_taxi_eth_mac_phy_10g.py @@ -185,9 +185,9 @@ class TB: async def run_test_rx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None, ifg=12): if len(dut.serdes_tx_data) == 64: - pipe_delay = 4 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 1 + 1 else: - pipe_delay = 5 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 2 + 1 tb = TB(dut, gbx_cfg) @@ -253,9 +253,9 @@ async def run_test_rx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None async def run_test_tx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None, ifg=12): if len(dut.serdes_tx_data) == 64: - pipe_delay = 5 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 else: - pipe_delay = 5 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 tb = TB(dut, gbx_cfg) @@ -316,9 +316,9 @@ async def run_test_tx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None async def run_test_tx_alignment(dut, gbx_cfg=None, payload_data=None, ifg=12): if len(dut.serdes_tx_data) == 64: - pipe_delay = 5 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 else: - pipe_delay = 6 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 dic_en = int(cocotb.top.DIC_EN.value) diff --git a/src/eth/tb/taxi_eth_mac_phy_10g_fifo/test_taxi_eth_mac_phy_10g_fifo.py b/src/eth/tb/taxi_eth_mac_phy_10g_fifo/test_taxi_eth_mac_phy_10g_fifo.py index 9e19b3b..0838c13 100644 --- a/src/eth/tb/taxi_eth_mac_phy_10g_fifo/test_taxi_eth_mac_phy_10g_fifo.py +++ b/src/eth/tb/taxi_eth_mac_phy_10g_fifo/test_taxi_eth_mac_phy_10g_fifo.py @@ -153,9 +153,9 @@ class TB: async def run_test_rx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None, ifg=12): if len(dut.serdes_tx_data) == 64: - pipe_delay = 4 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 1 + 1 else: - pipe_delay = 5 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 2 + 1 tb = TB(dut, gbx_cfg) @@ -217,9 +217,9 @@ async def run_test_rx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None async def run_test_tx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None, ifg=12): if len(dut.serdes_tx_data) == 64: - pipe_delay = 5 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 else: - pipe_delay = 5 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 tb = TB(dut, gbx_cfg) @@ -275,9 +275,9 @@ async def run_test_tx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None async def run_test_tx_alignment(dut, gbx_cfg=None, payload_data=None, ifg=12): if len(dut.serdes_tx_data) == 64: - pipe_delay = 5 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 else: - pipe_delay = 6 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 2 + 1 dic_en = int(cocotb.top.DIC_EN.value) diff --git a/src/eth/tb/taxi_eth_mac_phy_1g_basex/test_taxi_eth_mac_phy_1g_basex.py b/src/eth/tb/taxi_eth_mac_phy_1g_basex/test_taxi_eth_mac_phy_1g_basex.py index 5adcaa0..edc91dc 100644 --- a/src/eth/tb/taxi_eth_mac_phy_1g_basex/test_taxi_eth_mac_phy_1g_basex.py +++ b/src/eth/tb/taxi_eth_mac_phy_1g_basex/test_taxi_eth_mac_phy_1g_basex.py @@ -184,9 +184,9 @@ class TB: async def run_test_rx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None, ifg=12): if len(dut.serdes_tx_data) == 16: - pipe_delay = 4 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 1 + 1 else: - pipe_delay = 4 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 1 + 1 tb = TB(dut, gbx_cfg) @@ -252,9 +252,9 @@ async def run_test_rx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None async def run_test_tx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None, ifg=12): if len(dut.serdes_tx_data) == 16: - pipe_delay = 3 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 0 + 1 else: - pipe_delay = 3 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 0 + 1 tb = TB(dut, gbx_cfg) diff --git a/src/eth/tb/taxi_eth_mac_phy_1g_basex_fifo/test_taxi_eth_mac_phy_1g_basex_fifo.py b/src/eth/tb/taxi_eth_mac_phy_1g_basex_fifo/test_taxi_eth_mac_phy_1g_basex_fifo.py index 7baa109..3d201f6 100644 --- a/src/eth/tb/taxi_eth_mac_phy_1g_basex_fifo/test_taxi_eth_mac_phy_1g_basex_fifo.py +++ b/src/eth/tb/taxi_eth_mac_phy_1g_basex_fifo/test_taxi_eth_mac_phy_1g_basex_fifo.py @@ -152,9 +152,9 @@ class TB: async def run_test_rx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None, ifg=12): if len(dut.serdes_tx_data) == 64: - pipe_delay = 4 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 1 + 1 else: - pipe_delay = 4 + pipe_delay = int(dut.RX_SERDES_PIPELINE.value) + 1 + 1 tb = TB(dut, gbx_cfg) @@ -216,9 +216,9 @@ async def run_test_rx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None async def run_test_tx(dut, gbx_cfg=None, payload_lengths=None, payload_data=None, ifg=12): if len(dut.serdes_tx_data) == 16: - pipe_delay = 3 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 0 + 1 else: - pipe_delay = 3 + pipe_delay = int(dut.TX_SERDES_PIPELINE.value) + 0 + 1 tb = TB(dut, gbx_cfg)