Change event delivery ordering to be based on the order registerLink() is called in a component, rather than on the alphabetization of link names.

Author: feldergast

src/sst/core/baseComponent.cc

@@ -686,6 +686,7 @@ BaseComponent::configureLink_impl(const std::string& name, SimTime_t timebase, E
             }
         }
         tmp->setDefaultTimeBase(timebase);
+        tmp->setTag(getNextLinkOrder());
 #ifdef __SST_DEBUG_EVENT_TRACKING__
         tmp->setSendingComponentInfo(my_info_->getName(), my_info_->getType(), name);
 #endif
@@ -843,6 +844,12 @@ BaseComponent::pushValidParams(Params& params, const std::string& type)
     params.pushAllowedKeys(Factory::getFactory()->getParamNames(type));
 }
 
+uint32_t
+BaseComponent::getNextLinkOrder()
+{
+    return getParentComponent()->getNextLinkOrder();
+}
+
 
 void
 BaseComponent::vfatal(

src/sst/core/baseComponent.h

@@ -596,6 +596,12 @@ class BaseComponent : public SST::Core::Serialization::serializable_base
     void serialize_order(SST::Core::Serialization::serializer& ser) override;
 
 
+    /**
+       Gets the next value or the order field of the link.  The ordering of events based on links will be based on
+       the order that configureLink() is called.
+    */
+    virtual uint32_t getNextLinkOrder();
+
     /**
        Handles the profile points, default timebase, handler tracking and checkpointing.
 

src/sst/core/component.h

@@ -16,6 +16,7 @@
 #include "sst/core/eli/elementinfo.h"
 #include "sst/core/sst_types.h"
 
+#include <cstdint>
 #include <map>
 
 using namespace SST::Statistics;
@@ -58,6 +59,12 @@ class Component : public BaseComponent
 protected:
     friend class SubComponent;
     Component() = default; // For Serialization only
+
+private:
+
+    uint32_t getNextLinkOrder() override { return next_event_order_++; }
+
+    uint32_t next_event_order_ = 1;
 };
 
 } // namespace SST

src/sst/core/componentExtension.h

@@ -37,7 +37,7 @@ class ComponentExtension : public BaseComponent
     ComponentExtension() = default; // For serialization only
 
     void serialize_order(SST::Core::Serialization::serializer& ser) override;
-    ImplementSerializable(SST::ComponentExtension)
+    ImplementSerializable(SST::ComponentExtension);
 };
 
 } // namespace SST

src/sst/core/event.h

@@ -210,9 +210,9 @@ class Event : public Activity
        local links, delivery_info contains the delivery functor.
        @return void
      */
-    inline void setDeliveryInfo(LinkId_t tag, uintptr_t delivery_info)
+    inline void setDeliveryInfo(uint32_t order_tag, uintptr_t delivery_info)
     {
-        setOrderTag(tag);
+        setOrderTag(order_tag);
         this->delivery_info = delivery_info;
     }
 
@@ -228,9 +228,6 @@ class Event : public Activity
     /** Gets the link id used for delivery.  For use by SST Core only */
     inline Link* getDeliveryLink() { return reinterpret_cast<Link*>(delivery_info); }
 
-    /** Gets the link id associated with this event.  For use by SST Core only */
-    inline LinkId_t getTag() const { return getOrderTag(); }
-
 
     /** Holds the delivery information.  This is stored as a
       uintptr_t, but is actually a pointer converted using

src/sst/core/link.cc

@@ -501,7 +501,7 @@ Link::Link() :
     current_time(Simulation_impl::getSimulation()->currentSimCycle),
     type(UNINITIALIZED),
     mode(INIT),
-    tag(-1),
+    tag(type_max<uint32_t>),
     attached_tools(nullptr)
 {}
 

src/sst/core/link.h

@@ -127,6 +127,7 @@ class alignas(64) Link
     friend class Simulation_impl;
     friend class SyncManager;
     friend class ComponentInfo;
+    friend class BaseComponent;
 
     ~Link();
 
@@ -245,16 +246,16 @@ class alignas(64) Link
      */
     TimeConverter* getDefaultTimeBase();
 
-    /** Return the default Time Base for this link
-     * @return the default Time Base for this link
-     */
-    const TimeConverter* getDefaultTimeBase() const;
-
     /** Return the ID of this link
      * @return the unique ID for this link
      */
     LinkId_t getId() { return tag; }
 
+    /** Return the default Time Base for this link
+     * @return the default Time Base for this link
+     */
+    const TimeConverter* getDefaultTimeBase() const;
+
     /** Send data during the init() or complete() phase.
      * @param data event to send
      */
@@ -295,6 +296,21 @@ class alignas(64) Link
      */
     void setDeliveryInfo(uintptr_t info) { delivery_info = info; }
 
+    /**
+       Set the tag field for event link ordering
+     */
+    void setTag(uint32_t new_tag)
+    {
+        if ( tag != type_max<uint32_t> ) tag = new_tag;
+
+        // Interleaved links
+        // tag = new_tag;
+
+        // Ordered SelfLinks
+        // if ( tag != type_max<uint32_t> ) tag = new_tag;
+        // else tag = 0x80000000 | new_tag;
+    }
+
     /** Send an event over the link with additional delay. Sends an event
      * over a link with an additional delay specified with a
      * TimeConverter. I.e. the total delay is the link's delay + the
@@ -362,7 +378,7 @@ class alignas(64) Link
     SimTime_t& current_time;
     Type_t     type;
     Mode_t     mode;
-    LinkId_t   tag;
+    uint32_t   tag;
 
     /** Create a new link with a given tag
 
@@ -376,7 +392,7 @@ class alignas(64) Link
         value used for enforce_link_order (if that feature is
         enabled).
      */
-    explicit Link(LinkId_t tag);
+    explicit Link(uint32_t tag);
 
     Link(const Link& l);
 

src/sst/core/model/configGraph.cc

@@ -204,16 +204,16 @@ ConfigGraph::postCreationCleanup()
     // Need to assign the link delivery order.  This is done
     // alphabetically by link name. To save memory, we'll sort links_
     // by name, then sort it back by link_id
-    std::sort(links_.begin(), links_.end(),
-        [](const ConfigLink* lhs, const ConfigLink* rhs) -> bool { return lhs->name < rhs->name; });
+    // std::sort(links_.begin(), links_.end(),
+    //     [](const ConfigLink* lhs, const ConfigLink* rhs) -> bool { return lhs->name < rhs->name; });
 
     LinkId_t count = 1;
     for ( auto* link : links_ ) {
         link->order = count;
         count++;
     }
 
-    links_.sort();
+    // links_.sort();
 
     /* Force component / statistic registration for Group stats */
     for ( auto& cfg : getStatGroups() ) {

src/sst/core/sst_types.h

@@ -61,6 +61,10 @@ using volts  = double;
 #define UNLIKELY(x) __builtin_expect((int)(x), 0)
 #endif
 
+/* Template to get the maximum value of a type */
+template <typename T>
+inline constexpr T type_max = std::numeric_limits<T>::max();
+
 enum class SimulationRunMode {
     UNKNOWN, /*!< Unknown mode - Invalid for running */
     INIT,    /*!< Initialize-only.  Useful for debugging initialization and graph generation */

src/sst/core/subcomponent.h

@@ -63,7 +63,7 @@ class SubComponent : public BaseComponent
     void serialize_order(SST::Core::Serialization::serializer& ser) override;
 
     friend class Component;
-    ImplementSerializable(SST::SubComponent)
+    ImplementSerializable(SST::SubComponent);
 };
 
 } // namespace SST