[ParallelRouter] Fixed Issues and Upgraded CPS Submodule

Fixed issues in PR#6 and upgraded the CPS submodule.

Author: ueqri

libs/EXTERNAL/CPS

@@ -20,7 +20,7 @@ void MultiQueuePriorityQueue::init_heap(const DeviceGrid& grid) {
 }
 
 bool MultiQueuePriorityQueue::try_pop(pq_prio_t &prio, RRNodeId &node) {
-    auto tmp = pq_->tryPopWithMinPrio();
+    auto tmp = pq_->tryPop();
     if (!tmp) {
         return false;
     } else {
@@ -37,7 +37,13 @@ static inline pq_index_t cast_RRNodeId_to_pq_index_t(RRNodeId node) {
     return static_cast<pq_index_t>(std::size_t(node));
 }
 
-void MultiQueuePriorityQueue::add_to_heap(const pq_prio_t& prio, const RRNodeId& node) {
+void MultiQueuePriorityQueue::add_to_heap(const pq_prio_t& prio, const RRNodeId& node, const RRNodeId& target_node) {
+    if (node == target_node) {
+#ifdef MQ_IO_ENABLE_CLEAR_FOR_POP
+        pq_.setMinPrio(new_total_cost);
+#endif
+        return;
+    }
     pq_->push({prio, cast_RRNodeId_to_pq_index_t(node)});
 }
 

vpr/src/route/multi_queue_priority_queue.cpp

@@ -1,6 +1,8 @@
 #ifndef _MULTI_QUEUE_PRIORITY_QUEUE_H
 #define _MULTI_QUEUE_PRIORITY_QUEUE_H
 
+// #define MQ_IO_ENABLE_CLEAR_FOR_POP
+
 #include "heap_type.h"
 
 #include "MultiQueueIO.h"
@@ -26,7 +28,7 @@ class MultiQueuePriorityQueue {
 
     void init_heap(const DeviceGrid& grid);
     bool try_pop(pq_prio_t &prio, RRNodeId &node);
-    void add_to_heap(const pq_prio_t& prio, const RRNodeId& node);
+    void add_to_heap(const pq_prio_t& prio, const RRNodeId& node, const RRNodeId& target_node);
     void push_back(const pq_prio_t& prio, const RRNodeId& node);
     bool is_empty_heap() const;
     bool is_valid() const;
@@ -36,7 +38,6 @@ class MultiQueuePriorityQueue {
     inline uint64_t getNumPops() const { return pq_->getNumPops(); }
     inline uint64_t getHeapOccupancy() const { return pq_->getQueueOccupancy(); }
     inline void reset() { pq_->reset(); }
-    inline void setMinPrio(const pq_prio_t min_prio) { pq_->setMinPrioForPop(min_prio); }
 
   private:
     MQ_IO* pq_;

vpr/src/route/multi_queue_priority_queue.h

@@ -405,11 +405,6 @@ void ParallelConnectionRouter::timing_driven_route_connection_from_heap_thread_f
 
         // Should we explore the neighbors of this node?
 
-        if (inode == sink_node) {
-            heap_.setMinPrio(new_total_cost);
-            continue;
-        }
-
         if (should_not_explore_neighbors(inode, new_total_cost, rr_node_route_inf_[inode].backward_path_cost, sink_node, rr_node_route_inf_, cost_params)) {
             continue;
         }
@@ -634,7 +629,7 @@ void ParallelConnectionRouter::timing_driven_add_to_heap(const t_conn_cost_param
 
     releaseLock(to_node);
 
-    heap_.add_to_heap(next.total_cost, to_node);
+    heap_.add_to_heap(new_total_cost, to_node, target_node);
 
     // update_router_stats(router_stats_,
     //                     true,

vpr/src/route/parallel_connection_router.cpp

@@ -11,7 +11,10 @@
 #include "router_stats.h"
 #include "spatial_route_tree_lookup.h"
 
+// #define PROFILE_HEAP_OCCUPANCY
+#ifdef PROFILE_HEAP_OCCUPANCY
 #include <fstream>
+#endif
 
 // For details on setting core affinity, please see `parse_core_affinity_list`.
 #define ENABLE_CORE_AFFINITY