Testbench cleanup for cocotb 2.0

Signed-off-by: Alex Forencich <alex@alexforencich.com>

src/axi/tb/taxi_axi_adapter/test_taxi_axi_adapter.py

@@ -171,7 +171,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     data_width = len(cocotb.top.s_axi.wdata)
     byte_lanes = data_width // 8

src/axi/tb/taxi_axi_axil_adapter/test_taxi_axi_axil_adapter.py

@@ -171,7 +171,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     data_width = len(cocotb.top.s_axi.wdata)
     byte_lanes = data_width // 8

src/axi/tb/taxi_axi_fifo/test_taxi_axi_fifo.py

@@ -172,7 +172,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     data_width = len(cocotb.top.s_axi.wdata)
     byte_lanes = data_width // 8

src/axi/tb/taxi_axi_ram/test_taxi_axi_ram.py

@@ -163,7 +163,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     data_width = len(cocotb.top.s_axi.wdata)
     byte_lanes = data_width // 8

src/axi/tb/taxi_axi_register/test_taxi_axi_register.py

@@ -171,7 +171,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     data_width = len(cocotb.top.s_axi.wdata)
     byte_lanes = data_width // 8

src/axi/tb/taxi_axil_adapter/test_taxi_axil_adapter.py

@@ -163,7 +163,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_write, run_test_read]:
 

src/axi/tb/taxi_axil_axi_adapter/test_taxi_axil_axi_adapter.py

@@ -163,7 +163,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_write, run_test_read]:
 

src/axi/tb/taxi_axil_dp_ram/test_taxi_axil_dp_ram.py

@@ -196,7 +196,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_write, run_test_read]:
 

src/axi/tb/taxi_axil_ram/test_taxi_axil_ram.py

@@ -155,7 +155,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_write, run_test_read, run_stress_test]:
 

src/axi/tb/taxi_axil_register/test_taxi_axil_register.py

@@ -163,7 +163,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_write, run_test_read, run_stress_test]:
 

src/axis/tb/taxi_axis_adapter/test_taxi_axis_adapter.py

@@ -177,7 +177,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_arb_mux/test_taxi_axis_arb_mux.py

@@ -266,7 +266,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     ports = len(cocotb.top.s_axis)
 

src/axis/tb/taxi_axis_async_fifo/test_taxi_axis_async_fifo.py

@@ -612,7 +612,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_async_fifo_adapter/test_taxi_axis_async_fifo_adapter.py

@@ -612,7 +612,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_broadcast/test_taxi_axis_broadcast.py

@@ -112,7 +112,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_cobs_decode/test_taxi_axis_cobs_decode.py

@@ -180,7 +180,7 @@ def prbs_payload(length):
     return bytearray([next(gen) for x in range(length)])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_cobs_encode/test_taxi_axis_cobs_encode.py

@@ -187,7 +187,7 @@ def prbs_payload(length):
     return bytearray([next(gen) for x in range(length)])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_concat/test_taxi_axis_concat.py

@@ -160,7 +160,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_demux/test_taxi_axis_demux.py

@@ -124,7 +124,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     ports = len(cocotb.top.m_axis)
 

src/axis/tb/taxi_axis_fifo/test_taxi_axis_fifo.py

@@ -400,7 +400,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_fifo_adapter/test_taxi_axis_fifo_adapter.py

@@ -398,7 +398,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_mux/test_taxi_axis_mux.py

@@ -140,7 +140,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     ports = len(cocotb.top.s_axis)
 

src/axis/tb/taxi_axis_pipeline_fifo/test_taxi_axis_pipeline_fifo.py

@@ -257,7 +257,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_pipeline_register/test_taxi_axis_pipeline_register.py

@@ -173,7 +173,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_register/test_taxi_axis_register.py

@@ -173,7 +173,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/axis/tb/taxi_axis_switch/test_taxi_axis_switch.py

@@ -278,7 +278,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     s_count = len(cocotb.top.s_axis)
     m_count = len(cocotb.top.m_axis)

src/dma/tb/taxi_dma_psdpram/test_taxi_dma_psdpram.py

@@ -163,7 +163,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_write, run_test_read, run_stress_test]:
 

src/dma/tb/taxi_dma_psdpram_async/test_taxi_dma_psdpram_async.py

@@ -168,7 +168,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_write, run_test_read, run_stress_test]:
 

src/eth/tb/taxi_axis_baser_rx_32/test_taxi_axis_baser_rx_32.py

@@ -281,7 +281,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     gbx_cfgs = [None]
 

src/eth/tb/taxi_axis_baser_rx_64/test_taxi_axis_baser_rx_64.py

@@ -281,7 +281,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     gbx_cfgs = [None]
 

src/eth/tb/taxi_axis_baser_tx_32/test_taxi_axis_baser_tx_32.py

@@ -395,7 +395,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     gbx_cfgs = [None]
 

src/eth/tb/taxi_axis_baser_tx_64/test_taxi_axis_baser_tx_64.py

@@ -508,7 +508,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     gbx_cfgs = [None]
 

src/eth/tb/taxi_axis_gmii_rx/test_taxi_axis_gmii_rx.py

@@ -286,7 +286,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/eth/tb/taxi_axis_gmii_tx/test_taxi_axis_gmii_tx.py

@@ -394,7 +394,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/eth/tb/taxi_axis_xgmii_rx_32/test_taxi_axis_xgmii_rx_32.py

@@ -256,7 +256,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/eth/tb/taxi_axis_xgmii_rx_64/test_taxi_axis_xgmii_rx_64.py

@@ -257,7 +257,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/eth/tb/taxi_axis_xgmii_tx_32/test_taxi_axis_xgmii_tx_32.py

@@ -457,7 +457,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/eth/tb/taxi_axis_xgmii_tx_64/test_taxi_axis_xgmii_tx_64.py

@@ -459,7 +459,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/eth/tb/taxi_eth_mac_10g/test_taxi_eth_mac_10g.py

@@ -681,7 +681,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_rx, run_test_tx]:
 

src/eth/tb/taxi_eth_mac_10g_fifo/test_taxi_eth_mac_10g_fifo.py

@@ -292,7 +292,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_rx, run_test_tx]:
 

src/eth/tb/taxi_eth_mac_1g/test_taxi_eth_mac_1g.py

@@ -756,7 +756,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [
                 run_test_rx,

src/eth/tb/taxi_eth_mac_1g_fifo/test_taxi_eth_mac_1g_fifo.py

@@ -204,7 +204,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_rx, run_test_tx]:
 

src/eth/tb/taxi_eth_mac_1g_gmii/test_taxi_eth_mac_1g_gmii.py

@@ -620,7 +620,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_rx, run_test_tx]:
 

src/eth/tb/taxi_eth_mac_1g_gmii_fifo/test_taxi_eth_mac_1g_gmii_fifo.py

@@ -158,7 +158,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_rx, run_test_tx]:
 

src/eth/tb/taxi_eth_mac_1g_rgmii/test_taxi_eth_mac_1g_rgmii.py

@@ -624,7 +624,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_rx, run_test_tx]:
 

src/eth/tb/taxi_eth_mac_1g_rgmii_fifo/test_taxi_eth_mac_1g_rgmii_fifo.py

@@ -174,7 +174,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_rx, run_test_tx]:
 

src/eth/tb/taxi_eth_mac_25g_us/test_taxi_eth_mac_25g_us.py

@@ -911,7 +911,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_rx, run_test_tx]:
 

src/eth/tb/taxi_eth_mac_mii/test_taxi_eth_mac_mii.py

@@ -584,7 +584,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_rx, run_test_tx]:
 

src/eth/tb/taxi_eth_mac_mii_fifo/test_taxi_eth_mac_mii_fifo.py

@@ -134,7 +134,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_rx, run_test_tx]:
 

src/eth/tb/taxi_eth_mac_phy_10g/test_taxi_eth_mac_phy_10g.py

@@ -819,7 +819,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     gbx_cfgs = [None]
 

src/eth/tb/taxi_eth_mac_phy_10g_fifo/test_taxi_eth_mac_phy_10g_fifo.py

@@ -405,7 +405,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     gbx_cfgs = [None]
 

src/eth/tb/taxi_eth_phy_10g/test_taxi_eth_phy_10g.py

@@ -203,7 +203,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_rx, run_test_tx]:
 

src/eth/tb/taxi_mac_ctrl_rx/test_taxi_mac_ctrl_rx.py

@@ -505,7 +505,7 @@ def incrementing_payload(length):
     return bytes(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test_data)
     factory.add_option("payload_lengths", [size_list])

src/eth/tb/taxi_mac_ctrl_tx/test_taxi_mac_ctrl_tx.py

@@ -387,7 +387,7 @@ def incrementing_payload(length):
     return bytes(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test_data)
     factory.add_option("payload_lengths", [size_list])

src/eth/tb/taxi_mac_pause_ctrl_rx/test_taxi_mac_pause_ctrl_rx.py

@@ -364,7 +364,7 @@ async def run_test_pfc(dut):
     await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_lfc, run_test_pfc]:
 

src/eth/tb/taxi_mac_pause_ctrl_tx/test_taxi_mac_pause_ctrl_tx.py

@@ -315,7 +315,7 @@ async def run_test_pfc(dut):
     await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_lfc, run_test_pfc]:
 

src/eth/tb/taxi_xgmii_baser_dec/test_taxi_xgmii_baser_dec.py

@@ -188,7 +188,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/eth/tb/taxi_xgmii_baser_enc/test_taxi_xgmii_baser_enc.py

@@ -188,7 +188,7 @@ def cycle_en():
     return itertools.cycle([0, 0, 0, 1])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.add_option("payload_lengths", [size_list])

src/lfsr/tb/taxi_lfsr/test_taxi_lfsr.py

@@ -149,7 +149,7 @@ async def run_test_prbs(dut, ref_prbs):
         await Timer(10, 'ns')
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     if cocotb.top.LFSR_POLY.value == 0x4c11db7:
         factory = TestFactory(run_test_crc)

src/lfsr/tb/taxi_lfsr_crc/test_taxi_lfsr_crc.py

@@ -112,7 +112,7 @@ async def run_test_crc(dut, ref_crc):
     await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     if int(cocotb.top.LFSR_POLY.value) == 0x4c11db7:
         factory = TestFactory(run_test_crc)

src/lfsr/tb/taxi_lfsr_descramble/test_taxi_lfsr_descramble.py

@@ -145,7 +145,7 @@ async def run_test_descramble(dut, ref_scramble, ref_descramble):
     await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     # if cocotb.top.LFSR_POLY.value == 0x8000000001:
     if int(cocotb.top.LFSR_W.value) == 58:

src/lfsr/tb/taxi_lfsr_prbs_check/test_taxi_lfsr_prbs_check.py

@@ -146,7 +146,7 @@ async def run_test_prbs(dut, ref_prbs):
     assert err_cnt == 3
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     if int(cocotb.top.LFSR_POLY.value) == 0x021:
         factory = TestFactory(run_test_prbs)

src/lfsr/tb/taxi_lfsr_prbs_gen/test_taxi_lfsr_prbs_gen.py

@@ -150,7 +150,7 @@ async def run_test_scramble(dut, ref_scramble):
         await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     if int(cocotb.top.LFSR_POLY.value) == 0x021:
         factory = TestFactory(run_test_prbs)

src/lfsr/tb/taxi_lfsr_scramble/test_taxi_lfsr_scramble.py

@@ -128,7 +128,7 @@ async def run_test_scramble(dut, ref_scramble):
     await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     # if cocotb.top.LFSR_POLY.value == 0x8000000001:
     if int(cocotb.top.LFSR_W.value) == 58:

src/lss/tb/taxi_i2c_master/test_taxi_i2c_master.py

@@ -160,7 +160,7 @@ async def run_test_nack(dut):
     await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [
                 run_test_write,

src/lss/tb/taxi_i2c_single_reg/test_taxi_i2c_single_reg.py

@@ -131,7 +131,7 @@ async def run_test_nack(dut):
     await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [
                 run_test_write,

src/lss/tb/taxi_i2c_slave/test_taxi_i2c_slave.py

@@ -95,7 +95,7 @@ async def run_test(dut, payload_lengths=None, payload_data=None):
     await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.generate_tests()

src/lss/tb/taxi_i2c_slave_axil_master/test_taxi_i2c_slave_axil_master.py

@@ -131,7 +131,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_write, run_test_read]:
 

src/lss/tb/taxi_uart/test_taxi_uart.py

@@ -126,7 +126,7 @@ def prbs_payload(length):
     return bytearray([next(gen) for x in range(length)])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_tx, run_test_rx]:
         factory = TestFactory(test)

src/pcie/tb/taxi_pcie_axil_master/test_taxi_pcie_axil_master.py

@@ -285,7 +285,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [
                 run_test_write,

src/pcie/tb/taxi_pcie_axil_master_minimal/test_taxi_pcie_axil_master_minimal.py

@@ -320,7 +320,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [
                 run_test_write,

src/pcie/tb/taxi_pcie_us_axil_master/test_taxi_pcie_us_axil_master.py

@@ -387,7 +387,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [
                 run_test_write,

src/stats/tb/taxi_stats_collect/test_taxi_stats_collect.py

@@ -275,7 +275,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [
                 run_test_acc,

src/stats/tb/taxi_stats_counter/test_taxi_stats_counter.py

@@ -155,7 +155,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_acc]:
 

src/stats/tb/taxi_stats_strings_full/test_taxi_stats_strings_full.py

@@ -113,7 +113,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_strings]:
 

src/xfcp/tb/taxi_xfcp_if_uart/test_taxi_xfcp_if_uart.py

@@ -138,7 +138,7 @@ def incrementing_payload(length):
     return bytearray(itertools.islice(itertools.cycle(range(256)), length))
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_tx, run_test_rx]:
         factory = TestFactory(test)

src/xfcp/tb/taxi_xfcp_mod_axi/test_taxi_xfcp_mod_axi.py

@@ -191,7 +191,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_write, run_test_read, run_test_id]:
 

src/xfcp/tb/taxi_xfcp_mod_axil/test_taxi_xfcp_mod_axil.py

@@ -191,7 +191,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [run_test_write, run_test_read, run_test_id]:
 

src/xfcp/tb/taxi_xfcp_mod_i2c_master/test_taxi_xfcp_mod_i2c_master.py

@@ -297,7 +297,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     for test in [
                 run_test_write,

src/xfcp/tb/taxi_xfcp_switch/test_taxi_xfcp_switch.py

@@ -168,7 +168,7 @@ def cycle_pause():
     return itertools.cycle([1, 1, 1, 0])
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     ports = len(cocotb.top.xfcp_dsp_us)
 

src/zircon/tb/zircon_ip_len_cksum/test_zircon_ip_len_cksum.py

@@ -224,7 +224,7 @@ async def run_test(dut):
     await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.generate_tests()

src/zircon/tb/zircon_ip_rx_parse/test_zircon_ip_rx_parse.py

@@ -472,7 +472,7 @@ async def run_test(dut):
     await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.generate_tests()

src/zircon/tb/zircon_ip_tx_deparse/test_zircon_ip_tx_deparse.py

@@ -328,7 +328,7 @@ async def run_test(dut):
     await RisingEdge(dut.clk)
 
 
-if cocotb.SIM_NAME:
+if getattr(cocotb, 'top', None) is not None:
 
     factory = TestFactory(run_test)
     factory.generate_tests()