Add debugging support for DAG (#536)

* Add debugging support for DAG * Revert "Add debugging support for DAG" This reverts commit 7ba728f. * Add debugging support for DAG * Reset DAG after scheduler being reset
sparcians · Oct 30, 2024 · d63b335 · d63b335
1 parent 1477609
commit d63b335
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/sparta/sparta/kernel/DAG.hpp b/sparta/sparta/kernel/DAG.hpp
@@ -221,6 +221,7 @@ namespace sparta
         VertexMap                               gops_;
         bool                                    finalized_ = false;
         sparta::Scheduler*                      my_scheduler_ = nullptr;
+        const log::MessageSource                debug_logger_;
     };//End class DAG
 
 

diff --git a/sparta/src/DAG.cpp b/sparta/src/DAG.cpp
@@ -122,10 +122,17 @@ namespace sparta
         num_groups_(1),
         early_cycle_detect_(check_cycles),
         gops_(),
-        my_scheduler_(scheduler)
+        my_scheduler_(scheduler),
+        debug_logger_(scheduler,
+                      sparta::log::categories::DEBUG,
+                      "Scheduler's constructing DAG debug messages")
     {
         initializeDAG_();
-
+        // Enable early cycle detection when the debug logger is
+        // enabled for the convenience of debugging ...
+        if(debug_logger_.observed()){
+            early_cycle_detect_ = true;
+        }
     }
 
     void DAG::initializeDAG_()
@@ -171,20 +178,20 @@ namespace sparta
             dest_vertex->setInDAG(true);
         }
 
-        // TODO: REMOVE DEBUGGING STATEMENTS
-        //std::cout << "DAG::link()" << std::endl;
-        //std::cout << "\t" << std::string(*source_vertex) << " -> " << std::string(*dest_vertex) << std::endl;
+        if(SPARTA_EXPECT_FALSE(debug_logger_)){
+            debug_logger_ << SPARTA_CURRENT_COLOR_GREEN
+                          << "=== SCHEDULER: Add DAG link for "
+                          << reason << ": "
+                          << SPARTA_CURRENT_COLOR_NORMAL
+                          << std::string(*source_vertex) << " -> "
+                          << std::string(*dest_vertex);
+        }
 
         if (source_vertex->link(e_factory_, dest_vertex, reason)) {
             if (early_cycle_detect_ && detectCycle()) {
                 throw CycleException(getCycles_());
             }
         }
-
-        // TODO: DEBUGGING - remove this
-        //if (detectCycle()) {
-            //throw CycleException(getCycles_());
-        //}
     }
 
 

diff --git a/sparta/src/Scheduler.cpp b/sparta/src/Scheduler.cpp
@@ -165,8 +165,8 @@ void Scheduler::reset()
     enterTeardown(); // On RootTreeNode
     clearEvents();
 
-    dag_.reset(new DAG(this, false));
     dag_finalized_ = false;
+    dag_.reset(new DAG(this, false));
 
     tick_quantum_allocator_.clear();
 }