Remove cached segment map from connection map lookahead file.

Signed-off-by: Dusty DeWeese <[email protected]>
Signed-off-by: Keith Rothman <[email protected]>

Author: HackerFoo

libs/libvtrcapnproto/connection_map.capnp

@@ -20,6 +20,6 @@ struct VprFloatEntry {
 struct VprCostMap {
     costMap @0 :Matrix.Matrix((Matrix.Matrix(VprCostEntry)));
     offset @1 :Matrix.Matrix(VprVector2D);
-    segmentMap @2 :List(Int64);
+    depField @2 :List(Int64);
     penalty @3 :Matrix.Matrix(VprFloatEntry);
 }

vpr/src/route/connection_box_lookahead_map.cpp

@@ -110,17 +110,8 @@ static vtr::Point<T> closest_point_in_rect(const vtr::Rect<T>& r, const vtr::Poi
     }
 }
 
-// resize internal data structures
-void CostMap::set_counts(size_t seg_count, size_t box_count) {
-    cost_map_.clear();
-    offset_.clear();
-    penalty_.clear();
-    cost_map_.resize({seg_count, box_count});
-    offset_.resize({seg_count, box_count});
-    penalty_.resize({seg_count, box_count});
-    seg_count_ = seg_count;
-    box_count_ = box_count;
-
+// build the segment map
+void CostMap::build_segment_map() {
     const auto& device_ctx = g_vpr_ctx.device();
     segment_map_.resize(device_ctx.rr_nodes.size());
     for (size_t i = 0; i < segment_map_.size(); ++i) {
@@ -133,6 +124,18 @@ void CostMap::set_counts(size_t seg_count, size_t box_count) {
     }
 }
 
+// resize internal data structures
+void CostMap::set_counts(size_t seg_count, size_t box_count) {
+    cost_map_.clear();
+    offset_.clear();
+    penalty_.clear();
+    cost_map_.resize({seg_count, box_count});
+    offset_.resize({seg_count, box_count});
+    penalty_.resize({seg_count, box_count});
+    seg_count_ = seg_count;
+    box_count_ = box_count;
+}
+
 // cached node -> segment map
 int CostMap::node_to_segment(int from_node_ind) const {
     return segment_map_[from_node_ind];
@@ -638,6 +641,7 @@ void ConnectionBoxMapLookahead::compute(const std::vector<t_segment_inf>& segmen
     auto& device_ctx = g_vpr_ctx.device();
     cost_map_.set_counts(segment_inf.size(),
                          device_ctx.connection_boxes.num_connection_box_types());
+    cost_map_.build_segment_map();
 
     VTR_ASSERT(REPRESENTATIVE_ENTRY_METHOD == util::SMALLEST);
     RoutingCosts all_delay_costs;
@@ -1053,22 +1057,13 @@ static void FromFloat(VprFloatEntry::Builder* out, const float& in) {
 }
 
 void CostMap::read(const std::string& file) {
+    build_segment_map();
     MmapFile f(file);
 
     ::capnp::ReaderOptions opts = default_large_capnp_opts();
     ::capnp::FlatArrayMessageReader reader(f.getData(), opts);
 
     auto cost_map = reader.getRoot<VprCostMap>();
-
-    {
-        const auto& segment_map = cost_map.getSegmentMap();
-        segment_map_.resize(segment_map.size());
-        auto dst_iter = segment_map_.begin();
-        for (const auto& src : segment_map) {
-            *dst_iter++ = src;
-        }
-    }
-
     {
         const auto& offset = cost_map.getOffset();
         ToNdMatrix<2, VprVector2D, std::pair<int, int>>(
@@ -1093,13 +1088,6 @@ void CostMap::write(const std::string& file) const {
 
     auto cost_map = builder.initRoot<VprCostMap>();
 
-    {
-        auto segment_map = cost_map.initSegmentMap(segment_map_.size());
-        for (size_t i = 0; i < segment_map_.size(); ++i) {
-            segment_map.set(i, segment_map_[i]);
-        }
-    }
-
     {
         auto offset = cost_map.initOffset();
         FromNdMatrix<2, VprVector2D, std::pair<int, int>>(

vpr/src/route/connection_box_lookahead_map.h

@@ -50,6 +50,7 @@ typedef std::unordered_map<RoutingCostKey, float, HashRoutingCostKey> RoutingCos
 class CostMap {
   public:
     void set_counts(size_t seg_count, size_t box_count);
+    void build_segment_map();
     int node_to_segment(int from_node_ind) const;
     util::Cost_Entry find_cost(int from_seg_index, ConnectionBoxId box_id, int delta_x, int delta_y) const;
     void set_cost_map(const RoutingCosts& delay_costs, const RoutingCosts& base_costs);