Workaround for non-fetch AMO on CXI

wrrobin · May 29, 2024 · d6e2abf · d6e2abf
1 parent 934f44a
commit d6e2abf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/configure.ac b/configure.ac
@@ -297,7 +297,13 @@ AC_ARG_ENABLE([ofi-inject],
     [AC_HELP_STRING([--disable-ofi-inject],
                     [Disable OFI inject by default (default: enabled)])])
 AS_IF([test "$enable_ofi_inject" = "no"],
-      [AC_DEFINE([DISABLE_OFI_INJECT], [0], [If defined, the OFI will not use fi_inject.])])
+      [AC_DEFINE([DISABLE_OFI_INJECT], [1], [If defined, the OFI will not use fi_inject.])])
+
+AC_ARG_ENABLE([nonfetch-amo],
+    [AC_HELP_STRING([--disable-nonfetch-amo],
+                    [Disable non-fetching AMO and replace them with fetching AMO (default: enabled)])])
+AS_IF([test "$enable_nonfetch_amo" = "no"],
+      [AC_DEFINE([DISABLE_NONFETCH_AMO], [1], [If defined, SOS will fetch values for any AMO.])])
 
 AC_ARG_WITH([oshrun-launcher],
     [AC_HELP_STRING([--with-oshrun-launcher],

diff --git a/src/shmem_comm.h b/src/shmem_comm.h
@@ -244,8 +244,13 @@ shmem_internal_atomic(shmem_ctx_t ctx, void *target, const void *source, size_t
     if (shmem_shr_transport_use_atomic(ctx, target, len, pe, datatype)) {
         shmem_shr_transport_atomic(ctx, target, source, len, pe, op, datatype);
     } else {
+#ifdef DISABLE_NONFETCH_AMO
+        shmem_transport_fetch_atomic((shmem_transport_ctx_t *)ctx, target,
+                                     source, target, len, pe, op, datatype);
+#else
         shmem_transport_atomic((shmem_transport_ctx_t *)ctx, target, source,
                                len, pe, op, datatype);
+#endif
     }
 }