Merge pull request #4421 from shintaro-iwasaki/FixArgobotsSupport

Fix Argobots support

src/include/mpitimpl.h

@@ -1192,6 +1192,8 @@ extern MPID_Thread_mutex_t mpi_t_mutex;
     do { \
         int err_; \
         MPIR_T_THREAD_CHECK_BEGIN \
+        MPID_Thread_init(&err_); \
+        MPIR_Assert(err_ == 0); \
         MPID_Thread_mutex_create(&mpi_t_mutex, &err_); \
         MPIR_Assert(err_ == 0); \
         MPIR_T_THREAD_CHECK_END \
@@ -1203,6 +1205,8 @@ extern MPID_Thread_mutex_t mpi_t_mutex;
         MPIR_T_THREAD_CHECK_BEGIN \
         MPID_Thread_mutex_destroy(&mpi_t_mutex, &err_); \
         MPIR_Assert(err_ == 0); \
+        MPID_Thread_finalize(&err_); \
+        MPIR_Assert(err_ == 0); \
         MPIR_T_THREAD_CHECK_END \
     } while (0)
 

src/mpl/include/mpl_thread_argobots.h

@@ -18,13 +18,16 @@
 
 typedef ABT_mutex MPL_thread_mutex_t;
 typedef ABT_cond MPL_thread_cond_t;
-typedef ABT_thread_id MPL_thread_id_t;
+typedef ABT_thread MPL_thread_id_t;
 typedef ABT_key MPL_thread_tls_key_t;
 
 /* ======================================================================
  *    Creation and misc
  * ======================================================================*/
 
+/* MPL_thread_init()/MPL_thread_finalize() can be called in a nested manner
+ * (e.g., MPI_T_init_thread() and MPI_Init_thread()), but Argobots internally
+ * maintains a counter so it is okay. */
 #define MPL_thread_init(err_ptr_)                                             \
     do {                                                                      \
         int err__;                                                            \
@@ -50,9 +53,9 @@ typedef void (*MPL_thread_func_t) (void *data);
 void MPL_thread_create(MPL_thread_func_t func, void *data, MPL_thread_id_t * idp, int *errp);
 
 #define MPL_thread_exit()
-#define MPL_thread_self(id_) ABT_thread_self_id(id_)
-#define MPL_thread_join(id_) ABT_thread_join(id_)
-#define MPL_thread_same(id1_, id2_, same_)  ABT_thread_equal(id1_, id2_, same_)
+#define MPL_thread_self(idp_) ABT_thread_self(idp_)
+#define MPL_thread_join(idp_) ABT_thread_free(idp_)
+#define MPL_thread_same(idp1_, idp2_, same_)  ABT_thread_equal(*idp1_, *idp2_, same_)
 
 /* ======================================================================
  *    Scheduling

test/mpi/threads/comm/idup_deadlock.c

@@ -41,6 +41,7 @@ MTEST_THREAD_RETURN_TYPE test_comm_dup(void *arg)
             wait = 0;
             for (i = 0; i < NUM_THREADS; i++)
                 wait += start_idup[i];
+            MTest_thread_yield();
         } while (wait > NUM_THREADS / 2);
     }
 

test/mpi/threads/spawn/th_taskmaster.c

@@ -101,6 +101,10 @@ int main(int argc, char *argv[])
 #endif /* USE_THREADS */
 
 #ifdef USE_THREADS
+        /* Initialize the thread package. It should not be initialized via
+         * MTest_Init_thread since MTest_Finalize cannot be called. */
+        MTest_init_thread_pkg();
+
         /* We need different communicators per thread */
         for (i = 0; i < DEFAULT_TASK_WINDOW; i++)
             CHECK_SUCCESS(MPI_Comm_dup(MPI_COMM_WORLD, &th_comms[i]));
@@ -117,6 +121,9 @@ int main(int argc, char *argv[])
 
         for (i = 0; i < DEFAULT_TASK_WINDOW; i++)
             CHECK_SUCCESS(MPI_Comm_free(&th_comms[i]));
+
+        /* Release the thread package. */
+        MTest_finalize_thread_pkg();
 #else
         /* Directly spawn a child process to perform each task */
         for (i = 0; i < tasks;) {
@@ -141,6 +148,8 @@ int main(int argc, char *argv[])
     }
 
   fn_exit:
+    /* Do not call MTest_Finalize (and thus MTest_Init) to avoid printing extra
+     * "No Errors" as many as spawned MPI processes. */
     MPI_Finalize();
 
     return 0;

test/mpi/util/mtest_thread_abt.h

@@ -53,16 +53,27 @@ extern ABT_pool pools[MTEST_NUM_XSTREAMS];
 int MTest_Start_thread(MTEST_THREAD_RETURN_TYPE(*fn) (void *p), void *arg)
 {
     int ret;
+    ABT_thread_attr thread_attr;
 
     if (nthreads >= MTEST_MAX_THREADS) {
         fprintf(stderr, "Too many threads already created: max is %d\n", MTEST_MAX_THREADS);
         return 1;
     }
+
+    /* Make stack size large. */
+    ret = ABT_thread_attr_create(&thread_attr);
+    MTEST_ABT_ERROR(ret, "ABT_thread_attr_create");
+    ret = ABT_thread_attr_set_stacksize(thread_attr, 2 * 1024 * 1024);
+    MTEST_ABT_ERROR(ret, "ABT_thread_attr_set_stacksize");
+
     /* We push threads to pools[0] and let the random work-stealing
      * scheduler balance things out. */
-    ret = ABT_thread_create(pools[0], fn, arg, ABT_THREAD_ATTR_NULL, &threads[nthreads]);
+    ret = ABT_thread_create(pools[0], fn, arg, thread_attr, &threads[nthreads]);
     MTEST_ABT_ERROR(ret, "ABT_thread_create");
 
+    ret = ABT_thread_attr_free(&thread_attr);
+    MTEST_ABT_ERROR(ret, "ABT_thread_attr_free");
+
     nthreads++;
 
     return 0;
@@ -111,6 +122,14 @@ int MTest_thread_lock_free(MTEST_THREAD_LOCK_TYPE * lock)
     return 0;
 }
 
+int MTest_thread_yield(void)
+{
+    int ret;
+    ret = ABT_thread_yield();
+    MTEST_ABT_ERROR(ret, "ABT_thread_yield");
+    return 0;
+}
+
 /* -------------------------------------------- */
 #define HAVE_MTEST_THREAD_BARRIER 1
 

test/mpi/util/mtest_thread_pthread.h

@@ -80,6 +80,11 @@ int MTest_thread_lock_free(MTEST_THREAD_LOCK_TYPE * lock)
     return err;
 }
 
+int MTest_thread_yield(void)
+{
+    return 0;
+}
+
 /*----------------------------------------------------------------*/
 #if defined(HAVE_PTHREAD_BARRIER_INIT)
 

test/mpi/util/mtest_thread_win.h

@@ -90,3 +90,8 @@ int MTest_thread_lock_free(MTEST_THREAD_LOCK_TYPE * lock)
     }
     return MTestReturnValue(errs);
 }
+
+int MTest_thread_yield(void)
+{
+    return 0;
+}