Merge pull request sstsimulator#1621 from sstsimulator/devel

Automatically Merged using SST Master Branch Merger

Author: sst-autotester

src/sst/core/impl/interactive/debugConsole.cc

@@ -1708,7 +1708,7 @@ DebugConsole::cmd_print_rank_serial(std::string& cmd_str)
     result.clear();
 
     if ( current_rank == 0 ) {
-        succeed = cmd_ls_remote(tokens);
+        succeed = cmd_print_remote(tokens);
         std::cout << result.str();
     }
     else {

src/sst/core/serialization/impl/serialize_insertable.h

@@ -90,6 +90,7 @@ constexpr bool is_simple_map_v<MAP<KEY, REST...>> =
     (is_same_template_v<MAP, std::map> || is_same_template_v<MAP, std::unordered_map>) &&
     (std::is_arithmetic_v<KEY> || std::is_enum_v<KEY> || std::is_convertible_v<KEY, std::string>);
 
+
 // Whether it is a simple set (not a multiset and has integral, floating-point, enum, or convertible to string keys)
 template <typename>
 constexpr bool is_simple_set_v = false;
@@ -159,6 +160,18 @@ class serialize_impl<OBJ, std::enable_if_t<is_insertable_v<OBJ>>>
                 for ( bool e : obj )
                     SST_SER(e); // as_ptr_elem not valid for bool
             }
+            else if constexpr ( is_same_type_template_v<OBJ, std::map> ||
+                                is_same_type_template_v<OBJ, std::unordered_map> ||
+                                is_same_type_template_v<OBJ, std::multimap> ||
+                                is_same_type_template_v<OBJ, std::unordered_multimap> ) {
+
+                // Maps have to be treated differently in the case of the as_ptr_elem option
+                for ( auto& e : obj ) {
+                    auto& cast_e = const_cast<value_type&>(reinterpret_cast<const value_type&>(e));
+                    SST_SER_NAME(cast_e.first, "key");
+                    SST_SER_NAME(cast_e.second, "value", opts);
+                }
+            }
             else {
                 // Iterate over references to elements, casting away any const in keys
                 for ( auto& e : obj )

src/sst/core/serialization/objectMap.h

@@ -1019,7 +1019,6 @@ class TraceBuffer
 
     void resetTraceBuffer()
     {
-        printf("    Reset Trace Buffer\n");
         postCount_   = 0;
         cur_         = 0;
         first_       = 0;
@@ -1067,41 +1066,43 @@ class TraceBuffer
             // printf("    Sample: post trigger\n");
         }
 
+        if ( !(state_ == POSTTRIGGER && postCount_ >= postDelay_) ) {
 // Circular buffer
 #ifdef _OBJMAP_DEBUG_
-        std::cout << "    Sample:" << handler << ": numRecs:" << numRecs_ << " first:" << first_ << " cur:" << cur_
-                  << " state:" << state2char.at(state_) << " isOverrun:" << isOverrun_
-                  << " samplesLost:" << samplesLost_ << std::endl;
+            std::cout << "    Sample:" << handler << ": numRecs:" << numRecs_ << " first:" << first_ << " cur:" << cur_
+                      << " state:" << state2char.at(state_) << " isOverrun:" << isOverrun_
+                      << " samplesLost:" << samplesLost_ << std::endl;
 #endif
-        cycleBuffer_[cur_]   = cycle;
-        handlerBuffer_[cur_] = handler;
-        if ( trigger ) {
-            triggerCycle = cycle;
-        }
+            cycleBuffer_[cur_]   = cycle;
+            handlerBuffer_[cur_] = handler;
+            if ( trigger ) {
+                triggerCycle = cycle;
+            }
 
-        // Sample all the trace object buffers
-        ObjectBuffer* varBuffer_;
-        for ( size_t obj = 0; obj < numObjects; obj++ ) {
-            varBuffer_ = objBuffers_[obj];
-            varBuffer_->sample(cur_, trigger);
-        }
+            // Sample all the trace object buffers
+            ObjectBuffer* varBuffer_;
+            for ( size_t obj = 0; obj < numObjects; obj++ ) {
+                varBuffer_ = objBuffers_[obj];
+                varBuffer_->sample(cur_, trigger);
+            }
 
-        if ( numRecs_ < bufSize_ ) {
-            tagBuffer_[cur_] = state_;
-            numRecs_++;
-            cur_ = (cur_ + 1) % bufSize_;
-            if ( cur_ == 0 ) first_ = 0; // 1;
-        }
-        else { // Buffer full
-            // Check to see if we are overwriting trigger
-            if ( tagBuffer_[cur_] == TRIGGER ) {
-                // printf("    Sample Overrun\n");
-                isOverrun_ = true;
+            if ( numRecs_ < bufSize_ ) {
+                tagBuffer_[cur_] = state_;
+                numRecs_++;
+                cur_ = (cur_ + 1) % bufSize_;
+                if ( cur_ == 0 ) first_ = 0; // 1;
+            }
+            else { // Buffer full
+                // Check to see if we are overwriting trigger
+                if ( tagBuffer_[cur_] == TRIGGER ) {
+                    // printf("    Sample Overrun\n");
+                    isOverrun_ = true;
+                }
+                tagBuffer_[cur_] = state_;
+                numRecs_++;
+                cur_   = (cur_ + 1) % bufSize_;
+                first_ = cur_;
             }
-            tagBuffer_[cur_] = state_;
-            numRecs_++;
-            cur_   = (cur_ + 1) % bufSize_;
-            first_ = cur_;
         }
 
         if ( isOverrun_ ) {
@@ -1110,14 +1111,12 @@ class TraceBuffer
 
         if ( (state_ == TRIGGER) && (postDelay_ == 0) ) {
             invokeAction = true;
-            std::cout << "    Invoke Action\n";
         }
 
         if ( state_ == POSTTRIGGER ) {
             postCount_++;
             if ( postCount_ >= postDelay_ ) {
                 invokeAction = true;
-                std::cout << "    Invoke Action\n";
             }
         }
 

src/sst/core/serialization/serialize.h

@@ -13,6 +13,7 @@
 #define SST_CORE_SERIALIZATION_SERIALIZE_H
 
 #include "sst/core/from_string.h"
+#include "sst/core/output.h"
 #include "sst/core/serialization/objectMap.h"
 #include "sst/core/serialization/serializer.h"
 #include "sst/core/warnmacros.h"
@@ -207,7 +208,12 @@ class serialize
             // data needs to be serialized before any of the pointers
             // that point to it.
             if ( ser.sizer().check_pointer_sizer(ptr) ) {
-                // TODO Error
+                Output::getDefaultObject().output(
+                    "WARNING: Serializaion of object of type %s using as_ptr option detected that a pointer to this "
+                    "object was "
+                    "already serialized.  Serialization of the object should happen before serialization of any "
+                    "pointers to the object.\n",
+                    ObjectMap::demangle_name(typeid(T).name()).c_str());
             }
 
             // Always put the pointer in

src/sst/core/simulation.cc

@@ -56,7 +56,6 @@
 #include <fstream>
 #include <iostream>
 #include <map>
-#include <mutex>
 #include <ostream>
 #include <set>
 #include <string>
@@ -573,9 +572,9 @@ Simulation::getLocalMinimumNextActivityTime()
 void
 Simulation::processGraphInfo(ConfigGraph& graph, const RankInfo& UNUSED(myRank), SimTime_t min_part)
 {
-    // Set minPartTC (only thread 0 will do this)
-    Simulation::minPart = min_part;
     if ( my_rank.thread == 0 ) {
+        // Set minPartTC (only thread 0 will do this)
+        minPart   = min_part;
         minPartTC = minPartToTC(min_part);
     }
     // Get the minimum latencies for links between the various threads
@@ -636,7 +635,6 @@ Simulation::processGraphInfo(ConfigGraph& graph, const RankInfo& UNUSED(myRank),
     // Create the SyncManager for this rank.  It gets created even if
     // we are single rank/single thread because it also manages the
     // Exit and Heartbeat actions.
-    minPartTC   = minPartToTC(min_part);
     syncManager = new SyncManager(my_rank, num_ranks, min_part, interThreadLatencies, real_time_);
 
     // Check to see if the SyncManager profile tool is installed

src/sst/core/sync/syncManager.cc

@@ -379,6 +379,7 @@ RankSync::findSyncInterval(uint32_t UNUSED_WO_MPI(my_rank))
 void
 SyncManager::setupSyncObjects()
 {
+    ic_barrier_.resize(num_ranks_.thread);
     if ( rank_.thread == 0 ) {
         for ( auto& b : RankExecBarrier_ ) {
             b.resize(num_ranks_.thread);
@@ -438,7 +439,6 @@ SyncManager::SyncManager(const RankInfo& rank, const RankInfo& num_ranks, SimTim
 
     exit_       = sim_->getExit();
     checkpoint_ = sim_->getCheckpointAction();
-    ic_barrier_.resize(num_ranks_.thread);
 
     setPriority(SYNCPRIORITY);
 }

src/sst/core/threadsafe.h

@@ -51,6 +51,7 @@ class CACHE_ALIGNED_T Barrier
     size_t              origCount;
     std::atomic<bool>   enabled;
     std::atomic<size_t> count, generation;
+    std::mutex          barrierMutex;
 
 public:
     Barrier(size_t count) :
@@ -71,6 +72,7 @@ class CACHE_ALIGNED_T Barrier
     /** ONLY call this while nobody is in wait() */
     void resize(size_t newCount)
     {
+        std::lock_guard<std::mutex> lk(barrierMutex);
         count = origCount = newCount;
         generation.store(0);
         enabled.store(true);

src/sst/core/watchPoint.cc

@@ -383,7 +383,6 @@ void
 WatchPoint::setBufferReset()
 {
     if ( tb_ != nullptr ) {
-        printf("    Set Buffer Reset\n");
         tb_->setBufferReset();
         reset_ = true;
     }
@@ -412,7 +411,6 @@ WatchPoint::check()
         s << "      ";
         cmpObjects_[i]->print(s);
         s << " -> " << result2 << std::endl;
-        // printf("      comparison%ld = %d\n", i, result2);
 
         if ( logicOps_[i - 1] == LogicOp::AND ) {
             result = result && result2;

tests/refFiles/test_DebugConsole_Checkpoint_serial0.out

@@ -31,10 +31,7 @@ c1 talkingc1, bounce 991, t=9000000
 c0 talkingClock cycle count = 1
 c0 talkingRNG: 4074790800, 774252441, 24684
 c0 talkingDistributions: 1.500000, 5.000000, 0.721430, 0.919625, 0.000000, 1.000000
-    Invoke Action
-    Set Buffer Reset
 # Simulation Checkpoint: Simulated Time 10 us (Real CPU time since last checkpoint 0.04483 seconds)
-    Reset Trace Buffer
 c1 talkingClock cycle count = 1
 c1 talkingRNG: 4074790800, 774252441, 24684
 c1 talkingDistributions: 1.500000, 1.000000, 0.721430, 0.919625, 0.000000, 1.000000

tests/refFiles/test_DebugConsole_Checkpoint_serial1.out

@@ -31,10 +31,7 @@ c1 talkingc1, bounce 991, t=9000000
 c0 talkingClock cycle count = 1
 c0 talkingRNG: 4074790800, 774252441, 24684
 c0 talkingDistributions: 1.500000, 5.000000, 0.721430, 0.919625, 0.000000, 1.000000
-    Invoke Action
-    Set Buffer Reset
 # Simulation Checkpoint: Simulated Time 10 us (Real CPU time since last checkpoint 0.03792 seconds)
-    Reset Trace Buffer
 c1 talkingClock cycle count = 1
 c1 talkingRNG: 4074790800, 774252441, 24684
 c1 talkingDistributions: 1.500000, 1.000000, 0.721430, 0.919625, 0.000000, 1.000000