1596 Extend lb stats

src/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(TOP_LEVEL_SUBDIRS
   configs
   collective
+  elm
   epoch
   group
   messaging
@@ -33,6 +34,7 @@ set(
       collective/scatter/
       collective/reduce/
         collective/reduce/operators collective/reduce/functors
+    elm
     group/id group/region group/global group/msg group/collective group/rooted
     group/base
     pipe/id pipe/msg pipe/state pipe/signal pipe/interface pipe/callback

src/vt/context/runnable_context/base.h

@@ -45,6 +45,7 @@
 #define INCLUDED_VT_CONTEXT_RUNNABLE_CONTEXT_BASE_H
 
 #include "vt/configs/types/types_type.h"
+#include "vt/elm/elm_id.h"
 
 namespace vt { namespace ctx {
 
@@ -95,7 +96,7 @@ struct Base {
    * \param[in] size the size of the message
    * \param[in] bcast whether the message is being broadcast or sent
    */
-  virtual void send(NodeType dest, MsgSizeType size, bool bcast) { }
+  virtual void send(elm::ElementIDStruct dest, MsgSizeType bytes) { }
 };
 
 }} /* end namespace vt::ctx */

src/vt/context/runnable_context/lb_stats.cc

@@ -60,8 +60,8 @@ void LBStats::end() {
   }
 }
 
-void LBStats::send(NodeType dest, MsgSizeType size, bool bcast) {
-  stats_->recvToNode(dest, cur_elm_id_, size, bcast);
+void LBStats::send(elm::ElementIDStruct dest, MsgSizeType bytes) {
+  stats_->sendToEntity(dest, cur_elm_id_, bytes);
 }
 
 void LBStats::suspend() {

src/vt/context/runnable_context/lb_stats.h

@@ -46,7 +46,7 @@
 
 #include "vt/context/runnable_context/base.h"
 #include "vt/vrt/collection/balance/lb_common.h"
-#include "vt/vrt/collection/balance/elm_stats.fwd.h"
+#include "vt/elm/elm_stats.fwd.h"
 
 namespace vt { namespace ctx {
 
@@ -56,8 +56,8 @@ namespace vt { namespace ctx {
  * \brief Context for collection LB statistics when a task runs
  */
 struct LBStats final : Base {
-  using ElementIDStruct = vrt::collection::balance::ElementIDStruct;
-  using ElementStats = vrt::collection::balance::ElementStats;
+  using ElementIDStruct = elm::ElementIDStruct;
+  using ElementStats    = elm::ElementStats;
 
   /**
    * \brief Construct a \c LBStats
@@ -71,10 +71,14 @@ struct LBStats final : Base {
   /**
    * \brief Construct a \c LBStats
    *
-   * \param[in] in_elm the collection element
+   * \param[in] in_stats the statistics
+   * \param[in] in_elm_id the element ID
    */
-  template <typename ElmT>
-  explicit LBStats(ElmT* in_elm);
+  LBStats(ElementStats* in_stats, ElementIDStruct const& in_elm_id)
+    : stats_(in_stats),
+      cur_elm_id_(in_elm_id),
+      should_instrument_(true)
+  { }
 
   /**
    * \brief Set the context and timing for a collection task
@@ -94,7 +98,7 @@ struct LBStats final : Base {
    * \param[in] size the size of the message
    * \param[in] bcast whether the message is being broadcast or sent
    */
-  void send(NodeType dest, MsgSizeType size, bool bcast) final override;
+  void send(elm::ElementIDStruct dest, MsgSizeType bytes) final override;
 
   void suspend() final override;
   void resume() final override;

src/vt/context/runnable_context/lb_stats.impl.h

@@ -46,7 +46,7 @@
 
 #include "vt/context/runnable_context/lb_stats.h"
 #include "vt/messaging/active.h"
-#include "vt/vrt/collection/balance/elm_stats.h"
+#include "vt/elm/elm_stats.h"
 #include "vt/vrt/collection/manager.h"
 
 #include <memory>
@@ -63,13 +63,6 @@ LBStats::LBStats(ElmT* in_elm, MsgT* msg)
   theCollection()->recordStats(in_elm, msg);
 }
 
-template <typename ElmT>
-LBStats::LBStats(ElmT* in_elm)
-  : stats_(&in_elm->getStats()),
-    cur_elm_id_(in_elm->getElmID()),
-    should_instrument_(true)
-{ }
-
 }} /* end namespace vt::ctx */
 
 #endif /*INCLUDED_VT_CONTEXT_RUNNABLE_CONTEXT_LB_STATS_IMPL_H*/

src/vt/vrt/collection/balance/lb_comm.h → src/vt/elm/elm_comm.h

@@ -2,7 +2,7 @@
 //@HEADER
 // *****************************************************************************
 //
-//                                  lb_comm.h
+//                                  elm_comm.h
 //                       DARMA/vt => Virtual Transport
 //
 // Copyright 2019-2021 National Technology & Engineering Solutions of Sandia, LLC
@@ -41,15 +41,14 @@
 //@HEADER
 */
 
-#if !defined INCLUDED_VT_VRT_COLLECTION_BALANCE_LB_COMM_H
-#define INCLUDED_VT_VRT_COLLECTION_BALANCE_LB_COMM_H
+#if !defined INCLUDED_VT_ELM_ELM_COMM_H
+#define INCLUDED_VT_ELM_ELM_COMM_H
 
-#include "vt/config.h"
-#include "vt/vrt/collection/balance/lb_common.h"
+#include "vt/elm/elm_id.h"
 
 #include <unordered_map>
 
-namespace vt { namespace vrt { namespace collection { namespace balance {
+namespace vt { namespace elm {
 
 enum struct CommCategory : int8_t {
   SendRecv = 1,
@@ -66,43 +65,52 @@ inline NodeType objGetNode(ElementIDStruct const id) {
   return id.curr_node;
 }
 
-struct LBCommKey {
+struct CommKey {
 
+  struct SendRecvTag { };
   struct CollectionTag { };
   struct CollectionToNodeTag { };
   struct NodeToCollectionTag { };
 
-  LBCommKey() = default;
-  LBCommKey(LBCommKey const&) = default;
-  LBCommKey(LBCommKey&&) = default;
-  LBCommKey& operator=(LBCommKey const&) = default;
+  CommKey() = default;
+  CommKey(CommKey const&) = default;
+  CommKey(CommKey&&) = default;
+  CommKey& operator=(CommKey const&) = default;
 
-  LBCommKey(
+  CommKey(
+    SendRecvTag,
+    ElementIDStruct from, ElementIDStruct to,
+    bool bcast
+  ) : from_(from), to_(to),
+      cat_(bcast ? CommCategory::Broadcast : CommCategory::SendRecv)
+  { }
+
+  CommKey(
     CollectionTag,
     ElementIDStruct from, ElementIDStruct to,
     bool bcast
   ) : from_(from), to_(to),
       cat_(bcast ? CommCategory::Broadcast : CommCategory::SendRecv)
   { }
-  LBCommKey(
+  CommKey(
     CollectionToNodeTag,
     ElementIDStruct from, NodeType to,
     bool bcast
   ) : from_(from), nto_(to),
       cat_(bcast ? CommCategory::CollectionToNodeBcast : CommCategory::CollectionToNode)
   { }
-  LBCommKey(
+  CommKey(
     NodeToCollectionTag,
     NodeType from, ElementIDStruct to,
     bool bcast
   ) : to_(to), nfrom_(from),
       cat_(bcast ? CommCategory::NodeToCollectionBcast : CommCategory::NodeToCollection)
   { }
 
-  ElementIDStruct from_ = { no_element_id, uninitialized_destination, uninitialized_destination };
-  ElementIDStruct to_   = { no_element_id, uninitialized_destination, uninitialized_destination };
+  ElementIDStruct from_ = {};
+  ElementIDStruct to_   = {};
 
-  ElementIDStruct edge_id_ = { no_element_id, uninitialized_destination, uninitialized_destination };
+  ElementIDStruct edge_id_ = {};
   NodeType nfrom_          = uninitialized_destination;
   NodeType nto_            = uninitialized_destination;
   CommCategory  cat_       = CommCategory::SendRecv;
@@ -127,7 +135,7 @@ struct LBCommKey {
   }
   bool onNode() const { return !offNode(); }
 
-  bool operator==(LBCommKey const& k) const {
+  bool operator==(CommKey const& k) const {
     return
       k.from_  ==  from_ and k.to_  ==  to_ and
       k.nfrom_ == nfrom_ and k.nto_ == nto_ and
@@ -141,7 +149,7 @@ struct LBCommKey {
 };
 
 // Set the types for the communication graph
-using CommKeyType   = LBCommKey;
+using CommKeyType   = CommKey;
 using CommBytesType = double;
 
 struct CommVolume {
@@ -153,6 +161,11 @@ struct CommVolume {
     bytes += b;
   }
 
+  void sendMsg(double b) {
+    messages++;
+    bytes += b;
+  }
+
   void operator+=(const CommVolume &rhs) {
     bytes += rhs.bytes;
     messages += rhs.messages;
@@ -166,13 +179,13 @@ struct CommVolume {
 
 using CommMapType   = std::unordered_map<CommKeyType,CommVolume>;
 
-}}}} /* end namespace vt::vrt::collection::balance */
+}} /* end namespace vt::elm */
 
 namespace std {
 
-using CommCategoryType    = vt::vrt::collection::balance::CommCategory;
-using LBCommKeyType       = vt::vrt::collection::balance::LBCommKey;
-using ElementIDStructType = vt::vrt::collection::balance::ElementIDStruct;
+using CommCategoryType    = vt::elm::CommCategory;
+using CommKeyType         = vt::elm::CommKey;
+using ElementIDStructType = vt::elm::ElementIDStruct;
 
 template <>
 struct hash<CommCategoryType> {
@@ -184,8 +197,8 @@ struct hash<CommCategoryType> {
 };
 
 template <>
-struct hash<LBCommKeyType> {
-  size_t operator()(LBCommKeyType const& in) const {
+struct hash<CommKeyType> {
+  size_t operator()(CommKeyType const& in) const {
     return std::hash<uint64_t>()(
       std::hash<ElementIDStructType>()(in.from_) ^
       std::hash<ElementIDStructType>()(in.to_) ^ in.nfrom_ ^ in.nto_
@@ -195,4 +208,4 @@ struct hash<LBCommKeyType> {
 
 } /* end namespace std */
 
-#endif /*INCLUDED_VT_VRT_COLLECTION_BALANCE_LB_COMM_H*/
+#endif /*INCLUDED_VT_ELM_ELM_COMM_H*/

src/vt/elm/elm_id.cc

@@ -0,0 +1,61 @@
+/*
+//@HEADER
+// *****************************************************************************
+//
+//                                  elm_id.cc
+//                       DARMA/vt => Virtual Transport
+//
+// Copyright 2019-2021 National Technology & Engineering Solutions of Sandia, LLC
+// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
+// Government retains certain rights in this software.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+//
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+//
+// * Neither the name of the copyright holder nor the names of its
+//   contributors may be used to endorse or promote products derived from this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Questions? Contact [email protected]
+//
+// *****************************************************************************
+//@HEADER
+*/
+
+#include "vt/elm/elm_id.h"
+#include "vt/elm/elm_id_bits.h"
+
+namespace vt { namespace elm {
+
+bool ElementIDStruct::isMigratable() const {
+  return ElmIDBits::isMigratable(id);
+}
+
+NodeType ElementIDStruct::getHomeNode() const {
+  return ElmIDBits::getNode(id);
+}
+
+NodeType ElementIDStruct::getCurrNode() const {
+  return curr_node;
+}
+
+}} /* end namespace vt::elm */