From f64dcc991ca08791979635fbbe0456b8f9d0e300 Mon Sep 17 00:00:00 2001 From: Yossi Itigin Date: Thu, 25 Oct 2018 18:48:06 +0300 Subject: [PATCH 1/2] TEST/IB: Re-enable ODP tests, and flush sender iface to fix err syndrome The test used to fail because we didn't wait for all sends to complete before releasing the buffers. --- test/gtest/uct/ib/test_ib_xfer.cc | 6 ------ test/gtest/uct/test_p2p_mix.cc | 2 ++ test/gtest/uct/uct_p2p_test.cc | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/test/gtest/uct/ib/test_ib_xfer.cc b/test/gtest/uct/ib/test_ib_xfer.cc index b8eb7d6c2bc..90970994481 100644 --- a/test/gtest/uct/ib/test_ib_xfer.cc +++ b/test/gtest/uct/ib/test_ib_xfer.cc @@ -48,9 +48,6 @@ class uct_p2p_rma_test_alloc_methods : public uct_p2p_rma_test { UCS_TEST_P(uct_p2p_rma_test_alloc_methods, xfer_reg_odp, "REG_METHODS=odp,direct") { -#if defined(__powerpc64__) || defined(__aarch64__) - UCS_TEST_SKIP_R("odp on ppc64/aarch64"); -#endif test_put_zcopy(); test_get_zcopy(); } @@ -77,9 +74,6 @@ class uct_p2p_mix_test_alloc_methods : public uct_p2p_mix_test {}; UCS_TEST_P(uct_p2p_mix_test_alloc_methods, mix1000_odp, "REG_METHODS=odp,direct") { -#if defined(__powerpc64__) || defined(__aarch64__) - UCS_TEST_SKIP_R("odp on ppc64"); -#endif run(1000); } diff --git a/test/gtest/uct/test_p2p_mix.cc b/test/gtest/uct/test_p2p_mix.cc index fedb9d1461c..73218ea7c12 100644 --- a/test/gtest/uct/test_p2p_mix.cc +++ b/test/gtest/uct/test_p2p_mix.cc @@ -155,6 +155,8 @@ void uct_p2p_mix_test::run(unsigned count) { for (unsigned i = 0; i < count; ++i) { random_op(sendbuf, recvbuf); } + + sender().flush(); } void uct_p2p_mix_test::init() { diff --git a/test/gtest/uct/uct_p2p_test.cc b/test/gtest/uct/uct_p2p_test.cc index 420a986f31a..3c709779df9 100644 --- a/test/gtest/uct/uct_p2p_test.cc +++ b/test/gtest/uct/uct_p2p_test.cc @@ -166,6 +166,7 @@ void uct_p2p_test::test_xfer_multi(send_func_t send, size_t min_length, (uct_memory_type_t) mem_type); } } + void uct_p2p_test::test_xfer_multi_mem_type(send_func_t send, size_t min_length, size_t max_length, unsigned flags, uct_memory_type_t mem_type) { From 592a44509d1d17ef919c75b60f05e5d1c767f6af Mon Sep 17 00:00:00 2001 From: Yossi Itigin Date: Thu, 8 Nov 2018 17:18:54 +0200 Subject: [PATCH 2/2] TEST/ODP: Temporarily disable DM with ODP tests (To be reverted when all test systems are upgraded to MLNX_OFED 4.5) --- test/gtest/uct/ib/test_ib_xfer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/gtest/uct/ib/test_ib_xfer.cc b/test/gtest/uct/ib/test_ib_xfer.cc index 90970994481..c592b87a8a7 100644 --- a/test/gtest/uct/ib/test_ib_xfer.cc +++ b/test/gtest/uct/ib/test_ib_xfer.cc @@ -72,7 +72,7 @@ UCT_INSTANTIATE_IB_TEST_CASE(uct_p2p_rma_test_alloc_methods) class uct_p2p_mix_test_alloc_methods : public uct_p2p_mix_test {}; UCS_TEST_P(uct_p2p_mix_test_alloc_methods, mix1000_odp, - "REG_METHODS=odp,direct") + "REG_METHODS=odp,direct", "DM_COUNT?=0") { run(1000); }