Testbench cleanup for cocotb 2.0

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

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)