Merge pull request #5332 from hzhou/2106_xfail

xfail: remove already fixed xfails

Approved-by: Ken Raffenetti <[email protected]>

src/mpid/ch4/generic/am/mpidig_am_part.c

@@ -17,8 +17,6 @@ static int part_req_create(void *buf, int partitions, MPI_Aint count,
     MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDIG_PART_REQ_CREATE);
     MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDIG_PART_REQ_CREATE);
 
-    MPID_THREAD_CS_ENTER(VCI, MPIDI_VCI(0).lock);
-
     /* Set refcnt=1 for user-defined partitioned pattern; decrease at request_free. */
     MPIDI_CH4_REQUEST_CREATE(req, kind, 0, 1);
     MPIR_ERR_CHKANDSTMT((req) == NULL, mpi_errno, MPIX_ERR_NOREQ, goto fn_fail, "**nomemreq");
@@ -45,7 +43,6 @@ static int part_req_create(void *buf, int partitions, MPI_Aint count,
     *req_ptr = req;
 
   fn_exit:
-    MPID_THREAD_CS_EXIT(VCI, MPIDI_VCI(0).lock);
     MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDIG_PART_REQ_CREATE);
     return mpi_errno;
   fn_fail:
@@ -116,6 +113,7 @@ int MPIDIG_mpi_precv_init(void *buf, int partitions, int count,
     MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDIG_MPI_PRECV_INIT);
     MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDIG_MPI_PRECV_INIT);
 
+    MPID_THREAD_CS_ENTER(VCI, MPIDI_VCI(0).lock);
 
     /* Create and initialize device-layer partitioned request */
     mpi_errno = part_req_create(buf, partitions, count, datatype, source, tag, comm,
@@ -148,6 +146,7 @@ int MPIDIG_mpi_precv_init(void *buf, int partitions, int count,
 #endif
 
   fn_exit:
+    MPID_THREAD_CS_EXIT(VCI, MPIDI_VCI(0).lock);
     MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDIG_MPI_PRECV_INIT);
     return mpi_errno;
   fn_fail:

src/mpid/ch4/generic/am/mpidig_am_part.h

@@ -57,7 +57,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDIG_post_pready(MPIR_Request * part_sreq, int is
     MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDIG_POST_PREADY);
     MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDIG_POST_PREADY);
 
-    MPID_THREAD_CS_ENTER(VCI, MPIDI_VCI(0).lock);
+    /* note: already in critical section */
 
     /* Send data when all partitions are ready */
     if (MPIR_cc_get(MPIDIG_PART_REQUEST(part_sreq, u.send).ready_cntr) ==
@@ -68,7 +68,6 @@ MPL_STATIC_INLINE_PREFIX int MPIDIG_post_pready(MPIR_Request * part_sreq, int is
     }
 
   fn_exit:
-    MPID_THREAD_CS_EXIT(VCI, MPIDI_VCI(0).lock);
     MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDIG_POST_PREADY);
     return mpi_errno;
   fn_fail:
@@ -129,7 +128,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDIG_mpi_parrived(MPIR_Request * request, int par
         *flag = FALSE;
 
         /* Trigger progress to process AM packages in case wait with parrived in a loop. */
-        mpi_errno = MPID_Progress_test(NULL);
+        mpi_errno = MPIDI_progress_test_vci(0);
         MPIR_ERR_CHECK(mpi_errno);
     }
 

test/mpi/configure.ac

@@ -169,6 +169,10 @@ AC_ARG_ENABLE(rma,
 	[AS_HELP_STRING([--enable-rma],[Enable tests of the one sided parts of MPI-2 (default)])],,
 	[enable_rma=yes])
 
+AC_ARG_ENABLE(part,
+	[AS_HELP_STRING([--enable-part],[Enable tests of partitioned communication of MPI-4 (default)])],,
+	[enable_part=yes])
+
 AC_ARG_ENABLE(long-double-complex,
 	[AS_HELP_STRING([--enable-long-double-complex],
 		[Enable tests involving MPI_LONG_DOUBLE_COMPLEX (default)])],,
@@ -504,6 +508,14 @@ else
 fi
 AC_SUBST(rmadir)
 
+# Also allow partitioned communication to be disabled
+AC_ARG_VAR([MPI_NO_PART],[set to "yes" to disable partitioned communication tests])
+partdir=part
+if test "$enable_part" != "yes" -o "$MPI_NO_PART" = "yes" ; then
+    partdir="#"
+fi
+AC_SUBST(partdir)
+
 faultsdir=#
 if test "$enable_checkfaults" = "yes" ; then
     faultsdir=faults

test/mpi/maint/jenkins/xfail.conf

@@ -36,17 +36,8 @@
 * * * ch4:ucx * sed -i "s+\(^idup_comm_gen .*\)+\1 xfail=ticket3794+g" test/mpi/threads/comm/testlist
 * * * ch4:ucx * sed -i "s+\(^idup_nb .*\)+\1 xfail=ticket3794+g" test/mpi/threads/comm/testlist
 ################################################################################
-# xfail known failures of UCX build for Hackathon
-* * * ch4:ucx * sed -i "s+\(^win_large_shm .*\)+\1 xfail=ticket0+g" test/mpi/rma/testlist
-* * * ch4:ucx * sed -i "s+\(^strided_putget_indexed_shared .*\)+\1 xfail=ticket0+g" test/mpi/rma/testlist
-################################################################################
-# xfail known failures of OFI build for Hackathon
-* * * ch4:ofi * sed -i "s+\(^ibsend .*\)+\1 xfail=ticket0+g" test/mpi/threads/pt2pt/testlist
-* * * ch4:ofi * sed -i "s+\(^large_acc_flush_local .*\)+\1 xfail=issue3251+g" test/mpi/rma/testlist
-################################################################################
 # misc special build
 * * nofast * * sed -i "s+\(^large_acc_flush_local .*\)+\1 xfail=issue4663+g" test/mpi/rma/testlist
-* * shmem ch4:ofi * sed -i "s+\(^disconnect3 .*\)+\1 xfail=pr4517+g" test/mpi/spawn/testlist
 #ch3:ofi
 * * * ch3:ofi * sed -i  "s+\(^manyget .*\)+\1 xfail=ticket0+g" test/mpi/rma/testlist
 * * * ch3:ofi * sed -i  "s+\(^manyrma2 .*\)+\1 xfail=ticket0+g" test/mpi/rma/testlist
@@ -70,26 +61,12 @@
 * * * * freebsd32 sed -i "s|\(^putfence1 [0-9]* arg=-type=.* arg=-count=16000000 .*\)|\1 xfail=ticket0|g" test/mpi/rma/testlist.dtp
 * * * * ubuntu32 sed -i "s|\(^getfence1 [0-9]* arg=-type=.* arg=-count=16000000 .*\)|\1 xfail=ticket0|g" test/mpi/rma/testlist.dtp
 * * * * ubuntu32 sed -i "s|\(^putfence1 [0-9]* arg=-type=.* arg=-count=16000000 .*\)|\1 xfail=ticket0|g" test/mpi/rma/testlist.dtp
-# xfail all the tests that are taking too long because of performance bug on OFI (not using SHM)
-* * * ch4:ofi * sed -i "s|\(^getfence1 [0-9]* arg=-type=.* arg=-count=16000000 .*\)|\1 xfail=ticket2965|g" test/mpi/rma/testlist.dtp
-* * * ch4:ofi * sed -i "s|\(^putfence1 [0-9]* arg=-type=.* arg=-count=16000000 .*\)|\1 xfail=ticket2965|g" test/mpi/rma/testlist.dtp
-* * * ch4:ofi * sed -i "s|\(^lock_contention_dt [0-9]* arg=-type=.* arg=-count=262144 .*\)|\1 xfail=ticket2965|g" test/mpi/rma/testlist.dtp
-* * * ch4:ofi * sed -i "s|\(^lock_dt.* [0-9]* arg=-type=.* arg=-count=262144 .*\)|\1 xfail=ticket2965|g" test/mpi/rma/testlist.dtp
-* * * ch4:ofi * sed -i "s|\(^lockall_dt.* [0-9]* arg=-type=.* arg=-count=262144 .*\)|\1 xfail=ticket2965|g" test/mpi/rma/testlist.dtp
-* * * ch4:ofi * sed -i "s|\(^epochtest [0-9]* arg=-type=.* arg=-count=262144 .*\)|\1 xfail=ticket2965|g" test/mpi/rma/testlist.dtp
-* * * ch4:ofi * sed -i "s|\(^lock_contention_dt [0-9]* arg=-type=.* arg=-count=32768 .*\)|\1 xfail=ticket2965|g" test/mpi/rma/testlist.dtp
-* * * ch4:ofi * sed -i "s|\(^lock_dt.* [0-9]* arg=-type=.* arg=-count=32768 .*\)|\1 xfail=ticket2965|g" test/mpi/rma/testlist.dtp
-* * * ch4:ofi * sed -i "s|\(^lockall_dt.* [0-9]* arg=-type=.* arg=-count=32768 .*\)|\1 xfail=ticket2965|g" test/mpi/rma/testlist.dtp
-* * * ch4:ofi * sed -i "s|\(^accfence1 [0-9]* arg=-type=.* arg=-count=262144 .*\)|\1 xfail=ticket2965|g" test/mpi/rma/testlist.dtp
-* * * ch4:ofi * sed -i "s|\(^accpscw1 [0-9]* arg=-type=.* arg=-count=262144 .*\)|\1 xfail=ticket2965|g" test/mpi/rma/testlist.dtp
 # intercomm abort test are expected to fail since MPI_Finalize will try to perform Allreduce on all process (includeing the aborted ones)
 * * * * * sed -i "s+\(^intercomm_abort .*\)+\1 xfail=ticket0+g" test/mpi/errors/comm/testlist
 # asan glitches with ucx for large buffer (when greater than ~1GB)
 * * asan ch4:ucx * sed -i "s+\(^.*\(262144\|65530\|16000000\).*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.dtp
 * * asan ch4:ucx * sed -i "s+\(^.*\(262144\|65530\|16000000\).*\)+\1 xfail=ticket0+g" test/mpi/pt2pt/testlist.dtp
 * * asan ch4:ucx * sed -i "s+\(^.*\(262144\|65530\|16000000\).*\)+\1 xfail=ticket0+g" test/mpi/rma/testlist.dtp
-# Bug - Github Issue https://github.com/pmodels/mpich/issues/3469
-* * debug ch4:ucx * sed -i "s+\(^rqfreeb .*\)+\1 xfail=ticket0+g" test/mpi/pt2pt/testlist
 # Bug - Github Issue https://github.com/pmodels/mpich/issues/3618
 * * * ch4:ucx * sed -i "s+\(^darray_pack .*\)+\1 xfail=ticket0+g" test/mpi/datatype/testlist
 # Collectivess other than bcast don't currently detect mismatched datatype lengths
@@ -108,44 +85,14 @@
 * * * * * sed -i "s+\(^scatterlength .*\)+\1 xfail=ticket3655+g" test/mpi/errors/coll/testlist
 * * * * * sed -i "s+\(^iscatterlength .*\)+\1 xfail=ticket3655+g" test/mpi/errors/coll/testlist
 # some of the bcastlength test that is still failing
-* * am-only ch4:ucx * sed -i "s+\(^i*bcastlength .*\)+\1 xfail=issue3775+g" test/mpi/errors/coll/testlist
 * * *       ch3:ofi * sed -i "s+\(^ibcastlength .*\)+\1 xfail=issue3775+g" test/mpi/errors/coll/testlist
 * * *       ch3:ofi * sed -i "s+\(^bcastlength .*\)+\1 xfail=issue4373+g" test/mpi/errors/coll/testlist
 # hwloc is unable to detect topology info on FreeBSD in strict mode with GCC
 * gnu strict * freebsd64 sed -i "s+\(^cmsplit_type .*\)+\1 xfail=ticket3972+g" test/mpi/comm/testlist
 * gnu strict * freebsd32 sed -i "s+\(^cmsplit_type .*\)+\1 xfail=ticket3972+g" test/mpi/comm/testlist
-# Probe on LMT is failing for ofi, should be fixed by PR#4044
-* * *       ch4:ofi * sed -i "s+\(^mt_probe_sendrecv_huge .*\)+\1 xfail=issue4256+g" test/mpi/threads/pt2pt/testlist
-* * *       ch4:ofi * sed -i "s+\(^mt_iprobe_sendrecv_huge .*\)+\1 xfail=issue4259+g" test/mpi/threads/pt2pt/testlist
-* * *       ch4:ofi * sed -i "s+\(^mt_mprobe_sendrecv_huge .*\)+\1 xfail=issue4259+g" test/mpi/threads/pt2pt/testlist
-* * *       ch4:ofi * sed -i "s+\(^mt_improbe_sendrecv_huge .*\)+\1 xfail=issue4259+g" test/mpi/threads/pt2pt/testlist
-# multi-threading tests failing for ch3
-* * *       ch3:tcp * sed -i "s+\(^mt_iprobe_isendrecv .*\)+\1 xfail=issue4258+g" test/mpi/threads/pt2pt/testlist
-* * *       ch3:tcp * sed -i "s+\(^mt_improbe_isendrecv .*\)+\1 xfail=issue4258+g" test/mpi/threads/pt2pt/testlist
-# multi-threading tests failing for ch4:ucx
-* * *       ch4:ucx * sed -i "s+\(^mt_ibsendirecv_huge .*\)+\1 xfail=issue4262+g" test/mpi/threads/pt2pt/testlist
-* * *       ch4:ucx * sed -i "s+\(^mt_ibsendirecv_pers_huge .*\)+\1 xfail=issue4262+g" test/mpi/threads/pt2pt/testlist
-* * *       ch4:ucx * sed -i "s+\(^mt_bsendrecv_pers_huge .*\)+\1 xfail=issue4262+g" test/mpi/threads/pt2pt/testlist
-# xfail algorithms which can't handle all the cases
-* * * * * sed -i "s+\(^allred3.* env=MPIR_CVAR_IALLREDUCE_INTRA_ALGORITHM=gentran_ring.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^allred4.* env=MPIR_CVAR_IALLREDUCE_INTRA_ALGORITHM=gentran_ring.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^allred6.* env=MPIR_CVAR_IALLREDUCE_INTRA_ALGORITHM=gentran_ring.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^allred3.* env=MPIR_CVAR_IALLREDUCE_INTRA_ALGORITHM=recexch_reduce_scatter_recexch_allgatherv.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^allred4.* env=MPIR_CVAR_IALLREDUCE_INTRA_ALGORITHM=recexch_reduce_scatter_recexch_allgatherv.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^allred6.* env=MPIR_CVAR_IALLREDUCE_INTRA_ALGORITHM=recexch_reduce_scatter_recexch_allgatherv.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^allgatherv4.* env=MPIR_CVAR_IALLGATHERV_INTRA_ALGORITHM=gentran_recexch_doubling.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^allgatherv4.* env=MPIR_CVAR_IALLGATHERV_INTRA_ALGORITHM=gentran_recexch_halving.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^red_scat_block2.* env=MPIR_CVAR_IREDUCE_SCATTER_BLOCK_INTRA_ALGORITHM=gentran_recexch.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^redscat2.* env=MPIR_CVAR_IREDUCE_SCATTER_INTRA_ALGORITHM=gentran_recexch.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^alltoallv.* env=MPIR_CVAR_IALLTOALLV_INTRA_ALGORITHM=gentran_scattered.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^alltoallv.* env=MPIR_CVAR_IALLTOALLV_INTRA_ALGORITHM=gentran_blocked.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^alltoallw2.* env=MPIR_CVAR_IALLTOALLW_INTRA_ALGORITHM=gentran_blocked.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^alltoallw_zeros.* env=MPIR_CVAR_IALLTOALLW_INTRA_ALGORITHM=gentran_blocked.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^alltoallv.* env=MPIR_CVAR_IALLTOALLV_INTRA_ALGORITHM=gentran_inplace.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^alltoallv0.* env=MPIR_CVAR_IALLTOALLV_INTRA_ALGORITHM=gentran_inplace.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^alltoallw1.* env=MPIR_CVAR_IALLTOALLW_INTRA_ALGORITHM=gentran_inplace.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^alltoallw2.* env=MPIR_CVAR_IALLTOALLW_INTRA_ALGORITHM=gentran_inplace.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
-* * * * * sed -i "s+\(^alltoallw_zeros.* env=MPIR_CVAR_IALLTOALLW_INTRA_ALGORITHM=gentran_inplace.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
+# multi-threading tests failing for ch3 freebsd64
+* * *       ch3:tcp freebsd64 sed -i "s+\(^mt_iprobe_isendrecv .*\)+\1 xfail=issue4258+g" test/mpi/threads/pt2pt/testlist
+* * *       ch3:tcp freebsd64 sed -i "s+\(^mt_improbe_isendrecv .*\)+\1 xfail=issue4258+g" test/mpi/threads/pt2pt/testlist
 # pingping tests with large testsize currently fails async tests due to netmod handling of large message queue
 * * async * * sed -i "s+\(^pingping .*testsize=32.*\)+\1 xfail=issue4474+g" test/mpi/pt2pt/testlist.dtp
 # dup_leak_test suffers from mutex unfairness issue under load for ch4:ofi
@@ -157,16 +104,6 @@
 * * async * * sed -i "s+\(^.*_ALGORITHM=release_gather.*\)+\1 xfail=ticket0+g" test/mpi/coll/testlist.cvar
 # freebsd failures
 * * debug ch3:tcp freebsd64 sed -i "s+\(^comm_create_group_threads .*\)+\1 xfail=issue4372+g" test/mpi/threads/comm/testlist
-# skip mpi4 partitioned pt2pt tests which are not supported in ch3
-* * * ch3:ofi * sed -i  "s+\(^\S.*\)+\1 xfail=ticket0+g" test/mpi/part/testlist
-* * * ch3:sock * sed -i  "s+\(^\S.*\)+\1 xfail=ticket0+g" test/mpi/part/testlist
-* * * ch3:tcp * sed -i  "s+\(^\S.*\)+\1 xfail=ticket0+g" test/mpi/part/testlist
-* * * ch3:ofi * sed -i  "s+\(^\S.*\)+\1 xfail=ticket0+g" test/mpi/part/testlist.dtp
-* * * ch3:sock * sed -i  "s+\(^\S.*\)+\1 xfail=ticket0+g" test/mpi/part/testlist.dtp
-* * * ch3:tcp * sed -i  "s+\(^\S.*\)+\1 xfail=ticket0+g" test/mpi/part/testlist.dtp
-* * * ch3:ofi * sed -i  "s+\(^\S.*\)+\1 xfail=ticket0+g" test/mpi/threads/part/testlist
-* * * ch3:sock * sed -i  "s+\(^\S.*\)+\1 xfail=ticket0+g" test/mpi/threads/part/testlist
-* * * ch3:tcp * sed -i  "s+\(^\S.*\)+\1 xfail=ticket0+g" test/mpi/threads/part/testlist
 
 # Job-sepecific xfails
 # Our Arm servers are too slow for some tests

test/mpi/testlist.in

@@ -9,7 +9,7 @@ info
 init
 mpi_t
 pt2pt
-part
+@partdir@
 @rmadir@
 @spawndir@
 topo

test/mpi/threads/part/parrived_wait.c

@@ -101,7 +101,7 @@ static MTEST_THREAD_RETURN_TYPE run_send_test(void *arg)
 
     for (int i = lo; i <= high; i++)
         fill_send_partition(i, iter);
-    MPI_Pready_range(lo, high, &req);
+    MPI_Pready_range(lo, high, req);
 
     MTestPrintfMsg(1, "Rank %d tid %d sent partitions range %d:%d "
                    "with count %ld of basic elements\n", rank, tid, lo, high, scount);
@@ -124,7 +124,7 @@ static MTEST_THREAD_RETURN_TYPE run_recv_test(void *arg)
         int part1_completed = 0, part2_completed = 0;
         while (part1_completed == 0 || part2_completed == 0) {
             int flag = 0;
-            MPI_Parrived(&req, i, &flag);
+            MPI_Parrived(req, i, &flag);
             if (flag && part1_completed == 0) {
                 part1_completed = 1;
                 MTestPrintfMsg(1, "Rank %d tid %d received partition %d "
@@ -134,7 +134,7 @@ static MTEST_THREAD_RETURN_TYPE run_recv_test(void *arg)
             }
 
             if (i + 1 < rpart) {
-                MPI_Parrived(&req, i + 1, &flag);
+                MPI_Parrived(req, i + 1, &flag);
                 if (flag && part2_completed == 0) {
                     part2_completed = 1;
                     MTestPrintfMsg(1, "Rank %d tid %d received partition %d "

test/mpi/threads/testlist.in

@@ -4,5 +4,6 @@ init
 mpi_t
 @spawndir@
 @rmadir@
+@partdir@
 coll
 #perf