nox: Add workaround for running tag intersection

Signed-off-by: Wiktoria Kuna <[email protected]>

Author: wkkuna

verification/cocotb/block/axi_adapter/test_bus_stress.py

@@ -10,6 +10,8 @@
 import cocotb
 from cocotb.triggers import ClockCycles, Combine, RisingEdge, Timer, with_timeout
 
+from utils import target_test
+
 
 async def timeout_task(timeout):
     await Timer(timeout, "us")
@@ -70,7 +72,7 @@ async def initialize(dut, timeout=50):
     return tb, data_len, test_data
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_write(dut):
     tb, data_len, test_data = await initialize(dut)
 
@@ -108,7 +110,7 @@ async def reader(return_data):
     tb.log.info("Test finished!")
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_read(dut):
     tb, data_len, test_data = await initialize(dut)
 
@@ -152,7 +154,7 @@ async def reader(return_data):
     tb.log.info("Test finished!")
 
 
-@cocotb.test()
+@target_test()
 async def test_write_read_burst(dut):
     tb, data_len, test_data = await initialize(dut)
 
@@ -174,7 +176,7 @@ async def test_write_read_burst(dut):
     tb.log.info("Test finished!")
 
 
-@cocotb.test()
+@target_test()
 async def test_write_burst_collision_with_read(dut):
     tb, data_len, test_data = await initialize(dut)
 
@@ -213,7 +215,7 @@ async def reader(return_data):
     tb.log.info("Test finished!")
 
 
-@cocotb.test()
+@target_test()
 async def test_read_burst_collision_with_write(dut):
     tb, data_len, test_data = await initialize(dut)
 

verification/cocotb/block/axi_adapter_id_filter/test_bus_stress.py

@@ -4,7 +4,7 @@
 from axi_utils import initialize_dut
 from bus2csr import dword2int, int2bytes, int2dword
 from cocotbext.axi.constants import AxiBurstType
-from utils import Access, draw_axi_priv_ids, get_axi_ids_seq
+from utils import Access, draw_axi_priv_ids, get_axi_ids_seq, target_test
 
 import cocotb
 from cocotb.triggers import ClockCycles, Combine, RisingEdge, with_timeout
@@ -74,22 +74,22 @@ async def reader(return_data):
     verify_data(test_data, awids, received_data, arids, filter_off, priv_ids)
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_write_id_filter_off(dut):
     await collision_with_write(dut, True)
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_write_id_filter_on_priv(dut):
     await collision_with_write(dut, False, Access.Priv, Access.Priv)
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_write_id_filter_on_non_priv(dut):
     await collision_with_write(dut, False, Access.Priv, Access.Unpriv)
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_write_id_filter_on_mixed(dut):
     await collision_with_write(dut, False, Access.Priv, Access.Mixed)
 
@@ -140,22 +140,22 @@ async def reader(return_data):
     verify_data(test_data, awids, received_data, arids, filter_off, priv_ids)
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_read_id_filter_off(dut):
     await collision_with_read(dut, True)
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_read_id_filter_on_priv(dut):
     await collision_with_read(dut, False, Access.Priv, Access.Priv)
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_read_id_filter_on_non_priv(dut):
     await collision_with_read(dut, False, Access.Priv, Access.Unpriv)
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_read_id_filter_on_mixed(dut):
     await collision_with_read(dut, False, Access.Priv, Access.Mixed)
 
@@ -181,17 +181,17 @@ async def write_read_burst(dut, filter_off=False, awid_priv=True, arid_priv=True
     verify_data(test_data, awids, received_data, arids, filter_off, priv_ids)
 
 
-@cocotb.test()
+@target_test()
 async def test_write_read_burst_id_filter_off(dut):
     await write_read_burst(dut, True)
 
 
-@cocotb.test()
+@target_test()
 async def test_write_read_burst_id_filter_on_priv(dut):
     await write_read_burst(dut, False, Access.Priv, Access.Priv)
 
 
-@cocotb.test()
+@target_test()
 async def test_write_read_burst_id_filter_on_non_priv(dut):
     await write_read_burst(dut, False, Access.Priv, Access.Unpriv)
 
@@ -232,17 +232,17 @@ async def reader(return_data):
     verify_data(test_data, awids, received_data, arids, filter_off, priv_ids)
 
 
-@cocotb.test()
+@target_test()
 async def test_write_burst_collision_with_read_id_filter_off(dut):
     await write_burst_collision_with_read(dut, True)
 
 
-@cocotb.test(skip=False)
+@target_test()
 async def test_write_burst_collision_with_read_id_filter_on_priv(dut):
     await write_burst_collision_with_read(dut, False, Access.Priv, Access.Priv)
 
 
-@cocotb.test()
+@target_test()
 async def test_write_burst_collision_with_read_id_filter_on_non_priv(dut):
     await write_burst_collision_with_read(dut, False, Access.Priv, Access.Unpriv)
 
@@ -293,22 +293,22 @@ async def reader(return_data):
     verify_data(test_data, awids, received_data2, arids, filter_off, priv_ids)
 
 
-@cocotb.test()
+@target_test()
 async def test_read_burst_collision_with_write_id_filter_off(dut):
     await read_burst_collision_with_write(dut, True)
 
 
-@cocotb.test()
+@target_test()
 async def test_read_burst_collision_with_write_id_filter_on_priv(dut):
     await read_burst_collision_with_write(dut, False, Access.Priv, Access.Priv)
 
 
-@cocotb.test()
+@target_test()
 async def test_read_burst_collision_with_write_id_filter_on_non_priv(dut):
     await read_burst_collision_with_write(dut, False, Access.Priv, Access.Unpriv)
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_write_mixed_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tb, data_len, test_data = await initialize(dut, filter_off=False, priv_ids=priv_ids)
@@ -345,7 +345,7 @@ async def reader():
     await Combine(w, r)
 
 
-@cocotb.test()
+@target_test()
 async def test_collision_with_read_mixed_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tb, data_len, test_data = await initialize(dut, filter_off=False, priv_ids=priv_ids)

verification/cocotb/block/axi_adapter_id_filter/test_runtime_id_change.py

@@ -4,7 +4,7 @@
 from axi_utils import initialize_dut
 from bus2csr import dword2int, int2bytes
 from cocotbext.axi.constants import AxiBurstType
-from utils import Access, draw_axi_priv_ids, get_axi_ids_seq
+from utils import Access, draw_axi_priv_ids, get_axi_ids_seq, target_test
 
 import cocotb
 from cocotb.triggers import Combine, RisingEdge
@@ -87,12 +87,12 @@ async def toggle_filtering(dut, cond):
     await Combine(w, r)
 
 
-@cocotb.test()
+@target_test()
 async def test_toggle_filtering_mid_read(dut):
     await toggle_filtering(dut, lambda: dut.arready.value and dut.arvalid.value)
 
 
-@cocotb.test()
+@target_test()
 async def test_toggle_filtering_mid_write(dut):
     await toggle_filtering(dut, lambda: dut.wready.value and dut.wvalid.value)
 
@@ -119,17 +119,17 @@ async def swap_priv_ids(dut, cond):
     await Combine(w, r)
 
 
-@cocotb.test()
+@target_test()
 async def test_swap_priv_ids_mid_read(dut):
     await swap_priv_ids(dut, lambda: dut.arready.value and dut.arvalid.value)
 
 
-@cocotb.test()
+@target_test()
 async def test_swap_priv_ids_mid_write(dut):
     await swap_priv_ids(dut, lambda: dut.wready.value and dut.wvalid.value)
 
 
-@cocotb.test()
+@target_test()
 async def test_randomized_id_configuration_swap(dut):
     async def disable_random():
         while True:

verification/cocotb/block/axi_adapter_id_filter/test_seq_csr_access.py

@@ -20,6 +20,7 @@
     mask_bits,
     rand_bits,
     rand_bits32,
+    controller_test
 )
 
 import cocotb
@@ -39,18 +40,18 @@ async def read_hci_version_csr(dut, disable_id_filtering=False, priv_ids=None, t
     compare_values(expected_hci_version_value, resp, addr)
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_read_hci_version_csr_id_filter_off(dut):
     await read_hci_version_csr(dut, True, draw_axi_priv_ids(), rand_bits(AxiIdWidth))
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_read_hci_version_csr_id_filter_on_priv(dut):
     priv_ids = draw_axi_priv_ids()
     await read_hci_version_csr(dut, False, priv_ids, get_axi_ids_seq(priv_ids, 1, Access.Priv)[0])
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_read_hci_version_csr_id_filter_on_non_priv(dut):
     priv_ids = draw_axi_priv_ids()
     await read_hci_version_csr(dut, False, priv_ids, get_axi_ids_seq(priv_ids, 1, Access.Unpriv)[0])
@@ -71,19 +72,19 @@ async def read_pio_section_offset(dut, disable_id_filtering=False, priv_ids=None
     compare_values(expected, resp, addr)
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_read_pio_section_offset_filter_off(dut):
     await read_pio_section_offset(dut, True, draw_axi_priv_ids(), rand_bits(AxiIdWidth))
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_read_pio_section_offset_filter_on_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tid = get_axi_ids_seq(priv_ids, 1, Access.Priv)[0]
     await read_pio_section_offset(dut, False, priv_ids, tid)
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_read_pio_section_offset_filter_on_non_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tid = get_axi_ids_seq(priv_ids, 1, Access.Unpriv)[0]
@@ -109,19 +110,19 @@ async def write_to_controller_device_addr(dut, disable_id_filtering=False, priv_
     compare_values(wdata, resp, addr)
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_write_to_controller_device_addr_filter_off(dut):
     await write_to_controller_device_addr(dut, True, draw_axi_priv_ids(), rand_bits(AxiIdWidth))
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_write_to_controller_device_addr_filter_on_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tid = get_axi_ids_seq(priv_ids, 1, Access.Priv)[0]
     await write_to_controller_device_addr(dut, False, priv_ids, tid)
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_write_to_controller_device_addr_filter_on_non_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tid = get_axi_ids_seq(priv_ids, 1, Access.Unpriv)[0]
@@ -146,19 +147,19 @@ async def write_should_not_affect_ro_csr(dut, disable_id_filtering=False, priv_i
     compare_values(hc_cap, resp, addr)
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_write_should_not_affect_ro_csr_filter_off(dut):
     await write_should_not_affect_ro_csr(dut, True, draw_axi_priv_ids(), rand_bits(AxiIdWidth))
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_write_should_not_affect_ro_csr_filter_on_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tid = get_axi_ids_seq(priv_ids, 1, Access.Priv)[0]
     await write_should_not_affect_ro_csr(dut, False, priv_ids, tid)
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_write_should_not_affect_ro_csr_filter_on_non_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tid = get_axi_ids_seq(priv_ids, 1, Access.Unpriv)[0]
@@ -199,19 +200,19 @@ async def sequence_csr_read(dut, disable_id_filtering=False, priv_ids=None, tid=
         compare_values(int2bytes(value), resp, addr)
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_sequence_csr_read_filter_off(dut):
     await sequence_csr_read(dut, True, draw_axi_priv_ids(), rand_bits(AxiIdWidth))
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_sequence_csr_read_filter_on_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tid = get_axi_ids_seq(priv_ids, 1, Access.Priv)[0]
     await sequence_csr_read(dut, False, priv_ids, tid)
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_sequence_csr_read_filter_on_non_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tid = get_axi_ids_seq(priv_ids, 1, Access.Unpriv)[0]
@@ -261,19 +262,19 @@ async def sequence_csr_write(dut, disable_id_filtering=False, priv_ids=None, tid
         compare_values(int2bytes(value), resp, addr)
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_sequence_csr_write_filter_off(dut):
     await sequence_csr_write(dut, True, draw_axi_priv_ids(), rand_bits(AxiIdWidth))
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_sequence_csr_write_filter_on_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tid = get_axi_ids_seq(priv_ids, 1, Access.Priv)[0]
     await sequence_csr_write(dut, False, priv_ids, tid)
 
 
-@cocotb.test(skip=("ControllerSupport" not in cocotb.plusargs))
+@controller_test()
 async def test_sequence_csr_write_filter_on_non_priv(dut):
     priv_ids = draw_axi_priv_ids()
     tid = get_axi_ids_seq(priv_ids, 1, Access.Unpriv)[0]