TEST: fix mlx5 device memory allocation test (#976)

openucx · May 14, 2024 · 930634e · 930634e
1 parent b272589
commit 930634e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/test/gtest/tl/mlx5/test_tl_mlx5_wqe.cc b/test/gtest/tl/mlx5/test_tl_mlx5_wqe.cc
@@ -143,6 +143,9 @@ UCC_TEST_P(test_tl_mlx5_dm, MemcpyToDeviceMemory)
 {
     bufsize = GetParam();
     buffers_init();
+    if (!dm_ptr) {
+        return;
+    }
 
     if (bufsize % 4 != 0) {
         GTEST_SKIP() << "for memcpy involving device memory, buffer size "
@@ -162,6 +165,9 @@ UCC_TEST_P(test_tl_mlx5_dm, RdmaToDeviceMemory)
 
     bufsize = GetParam();
     buffers_init();
+    if (!dm_ptr) {
+        return;
+    }
 
     // RDMA write from host source to device memory
     memset(&sg, 0, sizeof(sg));
@@ -208,6 +214,9 @@ UCC_TEST_P(test_tl_mlx5_dm, CustomRdmaToDeviceMemory)
 {
     bufsize = GetParam();
     buffers_init();
+    if (!dm_ptr) {
+        return;
+    }
 
     // RDMA write from host source to device memory
     ibv_wr_start(qp.qp_ex);

diff --git a/test/gtest/tl/mlx5/test_tl_mlx5_wqe.h b/test/gtest/tl/mlx5/test_tl_mlx5_wqe.h
@@ -153,7 +153,7 @@ class test_tl_mlx5_rdma_write
 
 class test_tl_mlx5_dm : public test_tl_mlx5_rdma_write {
   public:
-    struct ibv_dm *          dm_ptr;
+    struct ibv_dm *          dm_ptr = nullptr;
     struct ibv_alloc_dm_attr dm_attr;
     struct ibv_mr *          dm_mr;
 
@@ -177,8 +177,10 @@ class test_tl_mlx5_dm : public test_tl_mlx5_rdma_write {
         memset(&dm_attr, 0, sizeof(dm_attr));
         dm_attr.length = bufsize;
         dm_ptr         = ibv_alloc_dm(ctx, &dm_attr);
-        GTEST_ASSERT_NE(dm_ptr, nullptr);
-        GTEST_ASSERT_NE(errno, 0);
+        if (!dm_ptr) {
+            GTEST_SKIP() << "device cannot allocate a buffer of size "
+                         << bufsize;
+        }
 
         dm_mr = ibv_reg_dm_mr(pd, dm_ptr, 0, dm_attr.length,
                               IBV_ACCESS_LOCAL_WRITE | IBV_ACCESS_REMOTE_WRITE |