UCT/UCP: Fix compilation errors with armcc-22.1

openucx · Apr 11, 2023 · a84db69 · a84db69
1 parent a5c3aae
commit a84db69
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/ucp/wireup/ep_match.c b/src/ucp/wireup/ep_match.c
@@ -88,7 +88,7 @@ ucp_ep_h ucp_ep_match_retrieve(ucp_worker_h worker, uint64_t dest_uuid,
                                ucp_ep_match_conn_sn_t conn_sn,
                                ucs_conn_match_queue_type_t conn_queue_type)
 {
-    ucp_ep_flags_t exp_ep_flags = UCP_EP_FLAG_ON_MATCH_CTX;
+    ucp_ep_flags_t UCS_V_UNUSED exp_ep_flags = UCP_EP_FLAG_ON_MATCH_CTX;
     ucs_conn_match_elem_t *conn_match;
     ucp_ep_h ep;
 

diff --git a/src/uct/ib/base/ib_verbs.h b/src/uct/ib/base/ib_verbs.h
@@ -71,6 +71,9 @@ static inline ucs_status_t uct_ib_query_device(struct ibv_context *ctx,
 #  define IBV_ACCESS_RELAXED_ORDERING               0
 #endif
 
+#if !HAVE_DECL_IBV_ACCESS_ON_DEMAND
+#  define IBV_ACCESS_ON_DEMAND                      0
+#endif
 
 /*
  * DC support

diff --git a/src/uct/ib/configure.m4 b/src/uct/ib/configure.m4
@@ -223,6 +223,7 @@ AS_IF([test "x$with_ib" = "xyes"],
                         [], [], [[#include <infiniband/verbs.h>]])
 
        AC_CHECK_DECLS([IBV_ACCESS_RELAXED_ORDERING,
+                       IBV_ACCESS_ON_DEMAND,
                        IBV_QPF_GRH_REQUIRED],
                       [], [], [[#include <infiniband/verbs.h>]])
 

diff --git a/src/uct/ib/mlx5/dv/ib_mlx5dv_md.c b/src/uct/ib/mlx5/dv/ib_mlx5dv_md.c
@@ -732,6 +732,12 @@ uct_ib_mlx5_devx_check_odp(uct_ib_mlx5_md_t *md,
         goto no_odp;
     }
 
+    if (IBV_ACCESS_ON_DEMAND == 0) {
+        ucs_debug("%s: disable ODP because IBV_ACCESS_ON_DEMAND is not supported",
+                  uct_ib_device_name(&md->super.dev));
+        goto no_odp;
+    }
+
     if (!UCT_IB_MLX5DV_GET(cmd_hca_cap, cap, pg)) {
         goto no_odp;
     }