Skip to content

Commit 5ac11a6

Browse files
committed
fabtests/efa: Enable sread tests for efa fabric
Signed-off-by: Darryl Abbate <[email protected]>
1 parent 71f4497 commit 5ac11a6

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

fabtests/pytest/efa/conftest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ def pytest_collection_modifyitems(session, config, items):
182182

183183

184184
@pytest.fixture(scope="function")
185-
def support_sread(cmdline_args):
185+
def support_sread(cmdline_args, fabric):
186+
if fabric == "efa":
187+
return True
186188
"""Check if both server and client support cq interrupts."""
187189
return (support_cq_interrupts(cmdline_args.server_id) and
188190
support_cq_interrupts(cmdline_args.client_id))

fabtests/pytest/efa/test_rdm.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,14 @@ def test_rdm_bw_zcpy_recv_use_fi_more(cmdline_args, memory_type, zcpy_recv_max_m
162162

163163
@pytest.mark.functional
164164
@pytest.mark.parametrize("comp_method", ["sread", "fd"])
165-
def test_rdm_pingpong_sread(cmdline_args, completion_semantic, memory_type_bi_dir, direct_message_size, support_sread, comp_method):
165+
@pytest.mark.parametrize("fabric", ["efa", "efa-direct"])
166+
def test_rdm_pingpong_sread(cmdline_args, completion_semantic, memory_type_bi_dir,
167+
direct_message_size, support_sread, comp_method, fabric):
166168
if not support_sread:
167169
pytest.skip("sread not supported by efa device.")
168170
efa_run_client_server_test(cmdline_args, f"fi_rdm_pingpong -c {comp_method}", "short",
169171
completion_semantic, memory_type_bi_dir,
170-
direct_message_size, fabric="efa-direct")
172+
direct_message_size if fabric == "efa-direct" else "all", fabric=fabric)
171173

172174

173175
# These tests skip efa-direct because efa-direct does not

fabtests/pytest/efa/test_rma_bw.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,10 @@ def test_rma_bw_sread(cmdline_args, rma_operation_type, rma_bw_completion_semant
9191
direct_rma_size, rma_bw_memory_type, support_sread, comp_method, rma_fabric):
9292
if not support_sread:
9393
pytest.skip("sread not supported by efa device.")
94-
if rma_fabric == "efa":
95-
pytest.skip("sread not implemented in efa fabric yet.")
9694
command = f"fi_rma_bw -e rdm -c {comp_method}"
9795
command = command + " -o " + rma_operation_type
9896
# rma_bw test with data verification takes longer to finish
9997
timeout = max(1080, cmdline_args.timeout)
10098
efa_run_client_server_test(cmdline_args, command, "short", rma_bw_completion_semantic,
101-
rma_bw_memory_type, direct_rma_size,
99+
rma_bw_memory_type, direct_rma_size if rma_fabric == "efa-direct" else "all",
102100
timeout=timeout, fabric=rma_fabric)

0 commit comments

Comments
 (0)