Merge pull request #6469 from uiuc-hpc/lci-pp

improve(lci pp): more options to control the LCI parcelport
STEllAR-GROUP · Apr 13, 2024 · 52eefee · 52eefee
2 parents 3add538 + bbf930d
commit 52eefee
Show file tree

Hide file tree

Showing 39 changed files with 482 additions and 137 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1166,7 +1166,7 @@ if(HPX_WITH_NETWORKING)
     ADVANCED
   )
   hpx_option(
-    HPX_WITH_LCI_TAG STRING "LCI repository tag or branch" "v1.7.6"
+    HPX_WITH_LCI_TAG STRING "LCI repository tag or branch" "v1.7.7"
     CATEGORY "Build Targets"
     ADVANCED
   )

diff --git a/libs/full/parcelport_lci/CMakeLists.txt b/libs/full/parcelport_lci/CMakeLists.txt
@@ -1,3 +1,4 @@
+# Copyright (c) 2023-2024 Jiakun Yan
 # Copyright (c) 2019-2021 The STE||AR-Group
 #
 # SPDX-License-Identifier: BSL-1.0
@@ -31,6 +32,7 @@ set(parcelport_lci_headers
     hpx/parcelport_lci/completion_manager/completion_manager_queue.hpp
     hpx/parcelport_lci/completion_manager/completion_manager_sync.hpp
     hpx/parcelport_lci/completion_manager/completion_manager_sync_single.hpp
+    hpx/parcelport_lci/completion_manager/completion_manager_sync_single_nolock.hpp
 )
 
 # cmake-format: off
@@ -50,6 +52,10 @@ set(parcelport_lci_sources
     sendrecv/sender_connection_sendrecv.cpp
     sendrecv/receiver_sendrecv.cpp
     sendrecv/receiver_connection_sendrecv.cpp
+    completion_manager/completion_manager_queue.cpp
+    completion_manager/completion_manager_sync.cpp
+    completion_manager/completion_manager_sync_single.cpp
+    completion_manager/completion_manager_sync_single_nolock.cpp
 )
 
 include(HPX_SetupLCI)

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/backlog_queue.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/backlog_queue.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2014-2023 Thomas Heller
 //
 //  SPDX-License-Identifier: BSL-1.0

diff --git a/...parcelport_lci/include/hpx/parcelport_lci/completion_manager/completion_manager_queue.hpp b/...parcelport_lci/include/hpx/parcelport_lci/completion_manager/completion_manager_queue.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2014-2023 Thomas Heller
 //
 //  SPDX-License-Identifier: BSL-1.0
@@ -10,12 +11,14 @@
 
 #if defined(HPX_HAVE_NETWORKING) && defined(HPX_HAVE_PARCELPORT_LCI)
 
+#include <hpx/parcelport_lci/config.hpp>
 #include <hpx/parcelport_lci/completion_manager_base.hpp>
 
 namespace hpx::parcelset::policies::lci {
     struct completion_manager_queue : public completion_manager_base
     {
-        completion_manager_queue()
+        completion_manager_queue(parcelport* pp)
+          : completion_manager_base(pp)
         {
             // LCI_queue_create(LCI_UR_DEVICE, &queue);
             // Hack for now
@@ -38,13 +41,7 @@ namespace hpx::parcelset::policies::lci {
             HPX_UNUSED(comp);
         }
 
-        LCI_request_t poll()
-        {
-            LCI_request_t request;
-            request.flag = LCI_ERR_RETRY;
-            LCI_queue_pop(queue, &request);
-            return request;
-        }
+        LCI_request_t poll();
 
         LCI_comp_t get_completion_object()
         {

diff --git a/.../parcelport_lci/include/hpx/parcelport_lci/completion_manager/completion_manager_sync.hpp b/.../parcelport_lci/include/hpx/parcelport_lci/completion_manager/completion_manager_sync.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2014-2023 Thomas Heller
 //
 //  SPDX-License-Identifier: BSL-1.0
@@ -10,14 +11,17 @@
 
 #if defined(HPX_HAVE_NETWORKING) && defined(HPX_HAVE_PARCELPORT_LCI)
 
-#include <hpx/parcelport_lci/completion_manager_base.hpp>
-
 #include <hpx/assert.hpp>
+#include <hpx/parcelport_lci/completion_manager_base.hpp>
+#include <deque>
 
 namespace hpx::parcelset::policies::lci {
     struct completion_manager_sync : public completion_manager_base
     {
-        completion_manager_sync() {}
+        completion_manager_sync(parcelport* pp)
+          : completion_manager_base(pp)
+        {
+        }
 
         ~completion_manager_sync() {}
 
@@ -34,34 +38,7 @@ namespace hpx::parcelset::policies::lci {
             sync_list.push_back(comp);
         }
 
-        LCI_request_t poll()
-        {
-            LCI_request_t request;
-            request.flag = LCI_ERR_RETRY;
-            if (sync_list.empty())
-            {
-                return request;
-            }
-            {
-                std::unique_lock l(lock, std::try_to_lock);
-                if (l.owns_lock() && !sync_list.empty())
-                {
-                    LCI_comp_t sync = sync_list.front();
-                    sync_list.pop_front();
-                    LCI_error_t ret = LCI_sync_test(sync, &request);
-                    if (ret == LCI_OK)
-                    {
-                        HPX_ASSERT(request.flag == LCI_OK);
-                        LCI_sync_free(&sync);
-                    }
-                    else
-                    {
-                        sync_list.push_back(sync);
-                    }
-                }
-            }
-            return request;
-        }
+        LCI_request_t poll();
 
     private:
         hpx::spinlock lock;

diff --git a/...port_lci/include/hpx/parcelport_lci/completion_manager/completion_manager_sync_single.hpp b/...port_lci/include/hpx/parcelport_lci/completion_manager/completion_manager_sync_single.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2014-2023 Thomas Heller
 //
 //  SPDX-License-Identifier: BSL-1.0
@@ -15,7 +16,8 @@
 namespace hpx::parcelset::policies::lci {
     struct completion_manager_sync_single : public completion_manager_base
     {
-        completion_manager_sync_single()
+        completion_manager_sync_single(parcelport* pp)
+          : completion_manager_base(pp)
         {
             LCI_sync_create(LCI_UR_DEVICE, 1, &sync);
         }
@@ -36,20 +38,7 @@ namespace hpx::parcelset::policies::lci {
             lock.unlock();
         }
 
-        LCI_request_t poll()
-        {
-            LCI_request_t request;
-            request.flag = LCI_ERR_RETRY;
-
-            bool succeed = lock.try_lock();
-            if (succeed)
-            {
-                LCI_error_t ret = LCI_sync_test(sync, &request);
-                if (ret == LCI_ERR_RETRY)
-                    lock.unlock();
-            }
-            return request;
-        }
+        LCI_request_t poll();
 
     private:
         hpx::spinlock lock;

diff --git a/...i/include/hpx/parcelport_lci/completion_manager/completion_manager_sync_single_nolock.hpp b/...i/include/hpx/parcelport_lci/completion_manager/completion_manager_sync_single_nolock.hpp
@@ -0,0 +1,48 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
+//  Copyright (c) 2014-2023 Thomas Heller
+//
+//  SPDX-License-Identifier: BSL-1.0
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#pragma once
+
+#include <hpx/config.hpp>
+
+#if defined(HPX_HAVE_NETWORKING) && defined(HPX_HAVE_PARCELPORT_LCI)
+
+#include <hpx/parcelport_lci/completion_manager_base.hpp>
+
+namespace hpx::parcelset::policies::lci {
+    struct completion_manager_sync_single_nolock
+      : public completion_manager_base
+    {
+        completion_manager_sync_single_nolock(parcelport* pp)
+          : completion_manager_base(pp)
+        {
+            LCI_sync_create(LCI_UR_DEVICE, 1, &sync);
+        }
+
+        ~completion_manager_sync_single_nolock()
+        {
+            LCI_sync_free(&sync);
+        }
+
+        LCI_comp_t alloc_completion()
+        {
+            return sync;
+        }
+
+        void enqueue_completion(LCI_comp_t comp)
+        {
+            HPX_UNUSED(comp);
+        }
+
+        LCI_request_t poll();
+
+    private:
+        LCI_comp_t sync;
+    };
+}    // namespace hpx::parcelset::policies::lci
+
+#endif
diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/completion_manager_base.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/completion_manager_base.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2014-2023 Thomas Heller
 //
 //  SPDX-License-Identifier: BSL-1.0
@@ -13,8 +14,11 @@
 #include <hpx/modules/lci_base.hpp>
 
 namespace hpx::parcelset::policies::lci {
+    class HPX_EXPORT parcelport;
     struct completion_manager_base
     {
+        completion_manager_base(parcelport* pp) noexcept
+          : pp_(pp){};
         virtual ~completion_manager_base() {}
         virtual LCI_comp_t alloc_completion() = 0;
         virtual void enqueue_completion(LCI_comp_t comp) = 0;
@@ -23,6 +27,7 @@ namespace hpx::parcelset::policies::lci {
         {
             return nullptr;
         }
+        parcelport* pp_;
     };
 }    // namespace hpx::parcelset::policies::lci
 

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/config.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/config.hpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2023 Jiakun Yan
+//  Copyright (c) 2023-2024 Jiakun Yan
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -29,15 +29,27 @@ namespace hpx::parcelset::policies::lci {
             putsendrecv,
         };
         static protocol_t protocol;
-        // which completion mechanism to use
-        static LCI_comp_type_t completion_type;
+        // Whether sending header requires completion
+        static bool enable_sendmc;
+        // which completion mechanism to use for header messages
+        enum class comp_type_t
+        {
+            queue,
+            sync,
+            sync_single,
+            sync_single_nolock,
+        };
+        static comp_type_t completion_type_header;
+        // which completion mechanism to use for followup messages
+        static comp_type_t completion_type_followup;
         // how to run LCI_progress
         enum class progress_type_t
         {
             rp,                // HPX resource partitioner
             pthread,           // Normal progress pthread
             worker,            // HPX worker thread
             pthread_worker,    // Normal progress pthread + worker thread
+            poll,              // progress when polling completion
         };
         static progress_type_t progress_type;
         // How many progress threads to create
@@ -57,6 +69,10 @@ namespace hpx::parcelset::policies::lci {
         static int send_nb_max_retry;
         // The max retry count of mbuffer_alloc before yield.
         static int mbuffer_alloc_max_retry;
+        // The max count of background_work to invoke in a row
+        static int bg_work_max_count;
+        // Whether to do background work when sending
+        static bool bg_work_when_send;
 
         static void init_config(util::runtime_configuration const& rtcfg);
     };

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/header.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/header.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2013-2014 Hartmut Kaiser
 //  Copyright (c) 2013-2015 Thomas Heller
 //

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/helper.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/helper.hpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2023 Jiakun Yan
+//  Copyright (c) 2023-2024 Jiakun Yan
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -20,7 +20,9 @@ namespace hpx::parcelset::policies::lci {
         {
             k = 0;
             if (hpx::threads::get_self_id() != hpx::threads::invalid_thread_id)
+            {
                 hpx::this_thread::yield();
+            }
         }
     }
 }    // namespace hpx::parcelset::policies::lci

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/locality.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/locality.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2007-2021 Hartmut Kaiser
 //  Copyright (c) 2013-2014 Thomas Heller
 //

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/parcelport_lci.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/parcelport_lci.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2014-2023 Thomas Heller
 //
 //  SPDX-License-Identifier: BSL-1.0
@@ -261,15 +262,20 @@ namespace hpx::traits {
                 "backlog_queue = 0\n"
                 "prg_thread_num = 1\n"
                 "protocol = putsendrecv\n"
-                "comp_type = queue\n"
+                "comp_type_header = queue\n"
+                "comp_type_followup = queue\n"
                 "progress_type = rp\n"
                 "prepost_recv_num = 1\n"
                 "reg_mem = 1\n"
                 "ndevices = 1\n"
                 "ncomps = 1\n"
                 "enable_in_buffer_assembly = 1\n"
                 "send_nb_max_retry = 32\n"
-                "mbuffer_alloc_max_retry = 32\n";
+                "mbuffer_alloc_max_retry = 32\n"
+                "bg_work_max_count = 32\n"
+                "bg_work_when_send = 0\n"
+                "enable_sendmc = 0\n"
+                "comp_type = deprecated\n";
         }
     };
 }    // namespace hpx::traits

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/putva/receiver_putva.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/putva/receiver_putva.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2007-2023 Hartmut Kaiser
 //  Copyright (c) 2014-2015 Thomas Heller
 //

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/putva/sender_connection_putva.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/putva/sender_connection_putva.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2014-2015 Thomas Heller
 //
 //  SPDX-License-Identifier: BSL-1.0

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/putva/sender_putva.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/putva/sender_putva.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2007-2013 Hartmut Kaiser
 //  Copyright (c) 2014-2015 Thomas Heller
 //

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/receiver_base.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/receiver_base.hpp
@@ -1,4 +1,4 @@
-
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2007-2013 Hartmut Kaiser
 //  Copyright (c) 2014-2015 Thomas Heller
 //

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/sender_base.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/sender_base.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2007-2013 Hartmut Kaiser
 //  Copyright (c) 2014-2015 Thomas Heller
 //

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/sender_connection_base.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/sender_connection_base.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2014-2015 Thomas Heller
 //
 //  SPDX-License-Identifier: BSL-1.0
@@ -73,7 +74,7 @@ namespace hpx::parcelset::policies::lci {
             postprocess_handler_type&& parcel_postprocess);
         virtual void load(handler_type&& handler,
             postprocess_handler_type&& parcel_postprocess) = 0;
-        return_t send();
+        return_t send(bool in_bg_work);
         virtual return_t send_nb() = 0;
         virtual void done() = 0;
         virtual bool tryMerge(

diff --git a/.../full/parcelport_lci/include/hpx/parcelport_lci/sendrecv/receiver_connection_sendrecv.hpp b/.../full/parcelport_lci/include/hpx/parcelport_lci/sendrecv/receiver_connection_sendrecv.hpp
@@ -1,3 +1,4 @@
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2014-2015 Thomas Heller
 //
 //  SPDX-License-Identifier: BSL-1.0

diff --git a/libs/full/parcelport_lci/include/hpx/parcelport_lci/sendrecv/receiver_sendrecv.hpp b/libs/full/parcelport_lci/include/hpx/parcelport_lci/sendrecv/receiver_sendrecv.hpp
@@ -1,4 +1,4 @@
-
+//  Copyright (c) 2023-2024 Jiakun Yan
 //  Copyright (c) 2007-2013 Hartmut Kaiser
 //  Copyright (c) 2014-2015 Thomas Heller
 //